From f42c26f6517c17d146fd4c3b34f48908ba637cce Mon Sep 17 00:00:00 2001
From: Courtney Owen <cowen@microsoft.com>
Date: Tue, 24 Nov 2020 14:17:59 -0800
Subject: [PATCH] Merge office-addin-taskpane/master

---
 .vscode/launch.json | 12 ++++++----
 package-lock.json   | 56 ++++++++++-----------------------------------
 package.json        |  2 +-
 3 files changed, 20 insertions(+), 50 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index cbe0a678..7a4bcf5a 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -30,8 +30,8 @@
       "type": "edge",
       "request": "attach",
       "useWebView": "advanced",
-      "port": 9222,
-      "timeout": 45000,
+      "port": 9229,
+      "timeout": 600000,
       "webRoot": "${workspaceRoot}",
       "preLaunchTask": "Debug: Excel Desktop",
       "postDebugTask": "Stop Debug"
@@ -42,11 +42,12 @@
       "request": "attach",
       "url": "https://localhost:3000/taskpane.html?_host_Info=Excel$Win32$16.01$en-US$$$$0",
       "port": 9222,
-      "timeout": 45000,
+      "timeout": 600000,
       "webRoot": "${workspaceRoot}",
       "preLaunchTask": "Debug: Excel Desktop",
       "postDebugTask": "Stop Debug"
     },
+
     {
       "name": "Office Online (Chrome)",
       "type": "chrome",
@@ -59,9 +60,10 @@
       "preLaunchTask": "Debug: Web"
     },
     {
-      "name": "Office Online (Edge)",
-      "type": "edge",
+      "name": "Office Online (Edge Chromium)",
+      "type": "pwa-msedge",
       "request": "launch",
+      "port": 9222,
       // To debug your Add-in:
       // 1. When prompted, enter the url (share link) to an Office Online document.
       // 2. Sideload your Add-in. https://docs.microsoft.com/en-us/office/dev/add-ins/testing/sideload-office-add-ins-for-testing
diff --git a/package-lock.json b/package-lock.json
index 07d0b23d..bdf9e086 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3319,26 +3319,6 @@
       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
       "dev": true
     },
-    "encoding": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "dev": true,
-      "requires": {
-        "iconv-lite": "^0.6.2"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.6.2",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
-          "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
-          "dev": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3.0.0"
-          }
-        }
-      }
-    },
     "end-of-stream": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
@@ -5451,25 +5431,13 @@
       "dev": true
     },
     "isomorphic-fetch": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
-      "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
+      "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==",
       "dev": true,
       "requires": {
-        "node-fetch": "^1.0.1",
-        "whatwg-fetch": ">=0.10.0"
-      },
-      "dependencies": {
-        "node-fetch": {
-          "version": "1.7.3",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
-          "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
-          "dev": true,
-          "requires": {
-            "encoding": "^0.1.11",
-            "is-stream": "^1.0.1"
-          }
-        }
+        "node-fetch": "^2.6.1",
+        "whatwg-fetch": "^3.4.1"
       }
     },
     "iterate-iterator": {
@@ -7087,13 +7055,13 @@
       "dev": true
     },
     "office-addin-test-helpers": {
-      "version": "1.0.24",
-      "resolved": "https://registry.npmjs.org/office-addin-test-helpers/-/office-addin-test-helpers-1.0.24.tgz",
-      "integrity": "sha512-YlT81U6cBE6sTc6Xk3G0FSfXKUazrb72qqE5P2WTe9/aNp5uVkZEw7VeGOfbPhNqW66WHH8TMZC+THyl0KCXwA==",
+      "version": "1.0.27",
+      "resolved": "https://registry.npmjs.org/office-addin-test-helpers/-/office-addin-test-helpers-1.0.27.tgz",
+      "integrity": "sha512-g45RS8bgMcb0L6i0CLIv/8kD5ZgAsKTDUAxXOfO7pSylpobay5MXPhN2gMKXWKj3QdviwF5SnjnvUihFNlCI3A==",
       "dev": true,
       "requires": {
         "es6-promise": "^4.2.8",
-        "isomorphic-fetch": "^2.2.1"
+        "isomorphic-fetch": "^3.0.0"
       }
     },
     "office-addin-test-server": {
@@ -10085,9 +10053,9 @@
       "dev": true
     },
     "whatwg-fetch": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz",
-      "integrity": "sha512-sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz",
+      "integrity": "sha512-jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A==",
       "dev": true
     },
     "whatwg-url": {
diff --git a/package.json b/package.json
index 91fa3f81..b8095d57 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "office-addin-lint": "^1.0.26",
     "office-addin-manifest": "1.5.7",
     "office-addin-prettier-config": "^1.0.12",
-    "office-addin-test-helpers": "^1.0.24",
+    "office-addin-test-helpers": "^1.0.27",
     "office-addin-test-server": "^1.0.30",
     "source-map-loader": "^0.2.4",
     "ts-loader": "^6.2.2",