From 8ffb1e29548bed098205372fce0db98dd9c304de Mon Sep 17 00:00:00 2001
From: Zhixiang Zhan <zhixzhan@microsoft.com>
Date: Thu, 10 Jun 2021 11:50:59 +0800
Subject: [PATCH] fix: Monaco editor loader CDN js path (#7968)

* reset monaco loader CDN js path

* upgrade monaco-editor from 0.19.0 to 0.21.2

Co-authored-by: Andy Brown <asbrown002@gmail.com>
Co-authored-by: Soroush <hatpick@gmail.com>
---
 .../packages/lib/code-editor/package.json     |  5 ++--
 .../packages/lib/code-editor/src/index.ts     |  8 +++++
 Composer/yarn.lock                            | 30 ++++++++++++++-----
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/Composer/packages/lib/code-editor/package.json b/Composer/packages/lib/code-editor/package.json
index 185f912be1..3cafbbc211 100644
--- a/Composer/packages/lib/code-editor/package.json
+++ b/Composer/packages/lib/code-editor/package.json
@@ -63,16 +63,15 @@
   "dependencies": {
     "@emotion/core": "^10.0.27",
     "@emotion/styled": "^10.0.27",
-    "@monaco-editor/react": "^3.1.0",
+    "@monaco-editor/react": "^3.8.3",
     "json-schema-defaults": "^0.4.0",
     "lodash": "^4.17.19",
-    "monaco-editor": "^0.19.0",
+    "monaco-editor": "^0.21.2",
     "monaco-languageclient": "^0.10.0",
     "normalize-url": "^4.5.0",
     "reconnecting-websocket": "^3.2.2",
     "vscode-ws-jsonrpc": "^0.1.1",
     "@uifabric/fluent-theme": "^7.1.4",
     "@fluentui/react-icons": "^0.3.9"
-
   }
 }
diff --git a/Composer/packages/lib/code-editor/src/index.ts b/Composer/packages/lib/code-editor/src/index.ts
index cb57f5fee1..f540425cbf 100644
--- a/Composer/packages/lib/code-editor/src/index.ts
+++ b/Composer/packages/lib/code-editor/src/index.ts
@@ -1,8 +1,16 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+import loader from '@monaco-editor/loader';
 import { monaco } from '@monaco-editor/react';
 
+// reset CDN path
+loader.config({
+  paths: {
+    vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.21.2/min/vs',
+  },
+});
+
 // initialize moanco api as early as possible
 monaco.init();
 
diff --git a/Composer/yarn.lock b/Composer/yarn.lock
index 78e351848e..ff8483ca2a 100644
--- a/Composer/yarn.lock
+++ b/Composer/yarn.lock
@@ -4194,10 +4194,19 @@
   resolved "https://registry.yarnpkg.com/@microsoft/recognizers-text-data-types-timex-expression/-/recognizers-text-data-types-timex-expression-1.3.0.tgz#fc5d586c826e478e8477b7fcb21e9e2830e81c67"
   integrity sha512-REHUXmMUI1jL3b9v+aSdzKxLxRdejsfg9McYRxY3LW0Gu4UbwD7Q+K6mtSo40cwg8uh6fiV9GY8hDuKXHH6dVA==
 
-"@monaco-editor/react@^3.1.0":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@monaco-editor/react/-/react-3.1.2.tgz#e2292f5b7905cbcd389d7fb06d886070fac68a23"
-  integrity sha512-V0ymTf5ClGh2zaWOXyrEC9gpF1B9YSZGRMpiobs3FixYdODwLbQS8Yqr9VGY1xc2riPFtXMzz9IPYxLGwmVszg==
+"@monaco-editor/loader@^0.1.2":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@monaco-editor/loader/-/loader-0.1.3.tgz#f8830ef2a5b826bc3452afa8ddb8b83b00ff54e9"
+  integrity sha512-AO5ERu/RV4B0Va3ymI4TYp/KeIUSPHQueE51jRjVcCsW72btEPUxCgnHTdBxpAvsfNEF1sLILtt1QOZqce3SWw==
+  dependencies:
+    state-local "^1.0.6"
+
+"@monaco-editor/react@^3.8.3":
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/@monaco-editor/react/-/react-3.8.3.tgz#36d19278fdee2a7f97fd193c0596df531b183a5e"
+  integrity sha512-wd+XzqATnUoODHSm2JMZi5OV9qeC8hdoSgoZHsTceXyH3Z/oktUtFbjaYeK0XL/lnXAScSYue81GA2UsiAx0sQ==
+  dependencies:
+    "@monaco-editor/loader" "^0.1.2"
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
@@ -16602,10 +16611,10 @@ moment@^2.15.1, moment@^2.24.0, moment@^2.27.0, moment@^2.29.1:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
   integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
 
-monaco-editor@^0.19.0:
-  version "0.19.3"
-  resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.19.3.tgz#1c994b3186c00650dbcd034d5370d46bf56c0663"
-  integrity sha512-2n1vJBVQF2Hhi7+r1mMeYsmlf18hjVb6E0v5SoMZyb4aeOmYPKun+CE3gYpiNA1KEvtSdaDHFBqH9d7Wd9vREg==
+monaco-editor@^0.21.2:
+  version "0.21.3"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/monaco-editor/-/monaco-editor-0.21.3.tgz#3381b66614b64d1c5e3b77dd5564ad496d1b4e5d"
+  integrity sha1-M4G2ZhS2TRxeO3fdVWStSW0bTl0=
 
 monaco-languageclient@^0.10.0:
   version "0.10.2"
@@ -21232,6 +21241,11 @@ stat-mode@^1.0.0:
   resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465"
   integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==
 
+state-local@^1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/state-local/-/state-local-1.0.7.tgz#da50211d07f05748d53009bee46307a37db386d5"
+  integrity sha512-HTEHMNieakEnoe33shBYcZ7NX83ACUjCu8c40iOGEZsngj9zRnkqS9j1pqQPXwobB0ZcVTk27REb7COQ0UR59w==
+
 state-toggle@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe"