From b4b65955fa582386b0a14ce7db209697cf3dcd40 Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Thu, 1 Aug 2019 17:35:32 -0700
Subject: [PATCH] Remove rhea-promise from preferredVersions

- Accidentally added in #4399
---
 common/config/rush/common-versions.json |  7 ++-----
 common/config/rush/pnpm-lock.yaml       | 25 ++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/common/config/rush/common-versions.json b/common/config/rush/common-versions.json
index 36f00bf46a0b..60de7c8e4997 100644
--- a/common/config/rush/common-versions.json
+++ b/common/config/rush/common-versions.json
@@ -19,11 +19,7 @@
 
     // resolve@1.12.0 causes a build break in storage-blob and storage-file related
     // to the rollup-plugin-commonjs namedExports of "events"
-    "resolve": "1.11.1",
-
-    // This is required to allow for backward compatibility with Service Bus Track 1
-    // TODO: Remove this once Service Bus is updated to use current depenedencies as part of Track 2
-    "rhea-promise": "^0.1.15"
+    "resolve": "1.11.1"
   },
   /**
    * The "rush check" command can be used to enforce that every project in the repo must specify
@@ -44,6 +40,7 @@
     //   "~2.4.0"
     // ]
     "@azure/ms-rest-js": ["^2.0.0"],
+
     // Following is required to allow for backward compatibility with Service Bus Track 1
     // TODO: Remove this once Service Bus is updated to use current depenedencies as part of Track 2
     "rhea-promise": ["^0.1.15"]
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 8a6fb5c021ec..1ef4e7f0a44a 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -1,6 +1,6 @@
 dependencies:
   '@azure/abort-controller': 1.0.0-preview.1
-  '@azure/amqp-common': 1.0.0-preview.6_rhea-promise@0.1.15
+  '@azure/amqp-common': 1.0.0-preview.6
   '@azure/arm-servicebus': 3.2.0
   '@azure/core-asynciterator-polyfill': 1.0.0-preview.1
   '@azure/core-auth': 1.0.0-preview.1
@@ -145,7 +145,6 @@ dependencies:
   requirejs: 2.3.6
   resolve: 1.11.1
   rhea: 1.0.8
-  rhea-promise: 0.1.15
   rimraf: 2.6.3
   rollup: 1.18.0
   rollup-plugin-alias: 1.5.2
@@ -196,6 +195,27 @@ packages:
     dev: false
     resolution:
       integrity: sha512-NnJqi6oHqt06Q2hz4nO1HO0QlyusBa3E/wezvn9flHEtl0IHYSmzGbtlb+MaAJ5GzxwqSevQ4q1+4B8fvVijOA==
+  /@azure/amqp-common/1.0.0-preview.6:
+    dependencies:
+      '@azure/ms-rest-nodeauth': 0.9.3
+      '@types/async-lock': 1.1.1
+      '@types/is-buffer': 2.0.0
+      async-lock: 1.2.2
+      buffer: 5.2.1
+      debug: 3.2.6
+      events: 3.0.0
+      is-buffer: 2.0.3
+      jssha: 2.3.1
+      process: 0.11.10
+      stream-browserify: 2.0.2
+      tslib: 1.10.0
+      url: 0.11.0
+      util: 0.11.1
+    dev: false
+    peerDependencies:
+      rhea-promise: ^0.1.15
+    resolution:
+      integrity: sha512-5XJZaJGtGoPmLhFx5y0vfCXiAHksoA4fdSnHAfkgEm4krhCW1jt1LH/6aJdUwUTJe+bz6m3Pv0sG/ILG0Vd65g==
   /@azure/amqp-common/1.0.0-preview.6_rhea-promise@0.1.15:
     dependencies:
       '@azure/ms-rest-nodeauth': 0.9.3
@@ -10892,7 +10912,6 @@ specifiers:
   requirejs: ^2.3.5
   resolve: 1.11.1
   rhea: ^1.0.4
-  rhea-promise: ^0.1.15
   rimraf: ^2.6.2
   rollup: ^1.16.3
   rollup-plugin-alias: ^1.4.0