Merge branch 'main' into zxyanliu/title-text/20200904

microsoft · Sep 8, 2020 · 34318ac · 34318ac
2 parents 983107f + 664addc
commit 34318ac
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 282 deletions.
diff --git a/Composer/package.json b/Composer/package.json
@@ -9,7 +9,8 @@
     "lodash": "^4.17.12",
     "set-value": "^3.0.2",
     "kind-of": "^6.0.3",
-    "elliptic": "^6.5.3"
+    "elliptic": "^6.5.3",
+    "bl": "^2.2.1"
   },
   "engines": {
     "node": ">=12"
@@ -121,4 +122,4 @@
     "wsrun": "^5.2.0"
   },
   "dependencies": {}
-}
+}
diff --git a/Composer/packages/server/package.json b/Composer/packages/server/package.json
@@ -95,5 +95,8 @@
     "vscode-languageserver": "^5.3.0-next",
     "vscode-ws-jsonrpc": "^0.1.1",
     "ws": "^5.0.0"
+  },
+  "resolutions": {
+    "bl": "^2.2.1"
   }
 }
diff --git a/Composer/plugins/azurePublish/package.json b/Composer/plugins/azurePublish/package.json
@@ -37,5 +37,8 @@
     "request": "2.88.2",
     "request-promise": "4.2.5",
     "uuid": "7.0.3"
+  },
+  "resolutions": {
+    "bl": "^4.0.3"
   }
-}
+}
diff --git a/Composer/plugins/azurePublish/yarn.lock b/Composer/plugins/azurePublish/yarn.lock
@@ -818,10 +818,10 @@ big-integer@^1.6.48:
   resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e"
   integrity sha1-j9iL0WMsukocjD49cVnwi7lbS54=
 
-bl@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz#52b71e9088515d0606d9dd9cc7aa48dc1f98e73a"
-  integrity sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==
+bl@^4.0.1, bl@^4.0.3:
+  version "4.0.3"
+  resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"
+  integrity sha1-EtYoetwpCA4ipwXldksqlSLNxIk=
   dependencies:
     buffer "^5.5.0"
     inherits "^2.0.4"

diff --git a/Composer/plugins/localPublish/package.json b/Composer/plugins/localPublish/package.json
@@ -18,5 +18,8 @@
     "portfinder": "^1.0.26",
     "rimraf": "^3.0.2",
     "uuid": "^7.0.1"
+  },
+  "resolutions": {
+    "bl": "^4.0.3"
   }
-}
+}
diff --git a/Composer/plugins/localPublish/yarn.lock b/Composer/plugins/localPublish/yarn.lock
@@ -79,10 +79,10 @@ base64-js@^1.0.2:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
   integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
 
-bl@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz#52b71e9088515d0606d9dd9cc7aa48dc1f98e73a"
-  integrity sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==
+bl@^4.0.1, bl@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"
+  integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==
   dependencies:
     buffer "^5.5.0"
     inherits "^2.0.4"

diff --git a/Composer/plugins/mockRemotePublish/package.json b/Composer/plugins/mockRemotePublish/package.json
@@ -11,16 +11,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "adm-zip": "^0.4.14",
-    "archiver": "^3.1.1",
-    "globby": "^11.0.0",
-    "path": "^0.12.7",
-    "portfinder": "^1.0.26",
-    "rimraf": "^3.0.2",
     "uuid": "^7.0.1"
   },
   "devDependencies": {
     "@bfc/plugin-loader": "file:../../packages/extensions/plugin-loader",
     "@types/uuid": "^7.0.2"
   }
-}
+}