From e66539e696465486ea33ab670b7780c9d27bc28e Mon Sep 17 00:00:00 2001
From: Yannick Reekmans <reekmans.yannick@gmail.com>
Date: Mon, 4 Apr 2022 21:20:32 +0200
Subject: [PATCH] Fix for #54, updating react-ace apparently creates conflicts
 with other components that are still using the older version of react-ace on
 the page

---
 config/package-solution.json |  4 ++--
 package-lock.json            | 23 ++++++-----------------
 package.json                 |  4 ++--
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/config/package-solution.json b/config/package-solution.json
index 4f9b106..30c2827 100644
--- a/config/package-solution.json
+++ b/config/package-solution.json
@@ -24,12 +24,12 @@
         "title": "People Search Feature",
         "description": "The feature that activates elements of the spfx-msgraph-peoplesearch solution.",
         "id": "e09916bd-8e2e-4220-8d05-60d3a6f4d98b",
-        "version": "2.6.0.0"
+        "version": "2.7.0.0"
       }
     ],
     "name": "Microsoft Graph People Search",
     "id": "98a8d9d1-47c4-477c-addd-ecae95b235cc",
-    "version": "2.6.0.0",
+    "version": "2.7.0.0",
     "includeClientSideAssets": true,
     "skipFeatureDeployment": true,
     "isDomainIsolated": false
diff --git a/package-lock.json b/package-lock.json
index 202279c..a98fdaa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7482,11 +7482,6 @@
         "negotiator": "0.6.3"
       }
     },
-    "ace-builds": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.14.tgz",
-      "integrity": "sha512-NBOQlm9+7RBqRqZwimpgquaLeTJFayqb9UEPtTkpC3TkkwDnlsT/TwsCC0svjt9kEZ6G9mH5AEOHSz6Q/HrzQQ=="
-    },
     "acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -10749,11 +10744,6 @@
       "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
       "dev": true
     },
-    "diff-match-patch": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz",
-      "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="
-    },
     "diff-sequences": {
       "version": "25.2.6",
       "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz",
@@ -20431,15 +20421,14 @@
       "integrity": "sha512-yCh3tx+jNuOPs+m58LOBFTGDEaGvM8UfuCNznr855FDAWzwV8V/ZH/TVBvgqH0npP58KrrVrHpj4jcy0EE5hEw=="
     },
     "react-ace": {
-      "version": "9.5.0",
-      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-9.5.0.tgz",
-      "integrity": "sha512-4l5FgwGh6K7A0yWVMQlPIXDItM4Q9zzXRqOae8KkCl6MkOob7sC1CzHxZdOGvV+QioKWbX2p5HcdOVUv6cAdSg==",
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-5.8.0.tgz",
+      "integrity": "sha1-hy2e6LZkMA7Vq57axiNLvpCDaDY=",
       "requires": {
-        "ace-builds": "^1.4.13",
-        "diff-match-patch": "^1.0.5",
+        "brace": "^0.11.0",
         "lodash.get": "^4.4.2",
-        "lodash.isequal": "^4.5.0",
-        "prop-types": "^15.7.2"
+        "lodash.isequal": "^4.1.1",
+        "prop-types": "^15.5.8"
       }
     },
     "react-addons-shallow-compare": {
diff --git a/package.json b/package.json
index 3c355c1..f59fe8e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spfx-msgraph-peoplesearch",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "private": true,
   "main": "lib/index.js",
   "scripts": {
@@ -20,7 +20,7 @@
     "immutability-helper": "3.1.1",
     "office-ui-fabric-react": "7.174.1",
     "react": "16.13.1",
-    "react-ace": "9.5.0",
+    "react-ace": "5.8.0",
     "react-dom": "16.13.1"
   },
   "devDependencies": {