From f917c2ab0fdce4af5c63cf9f19475045d654894e Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <sotirakis.dim@gmail.com>
Date: Fri, 12 Mar 2021 12:28:54 +0200
Subject: [PATCH] =?UTF-8?q?Bug:=20Update=20`react-use-measure`=20dependenc?=
 =?UTF-8?q?y=20to=20fix=20docker-build-full=20f=E2=80=A6=20(#31802)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Bug: Update `react-use-measure` dependency to fix docker-build-full failure

* Add #remove-cjs-export to point to the correct branch

* Add git package - update js-builder version
---
 Dockerfile   | 3 ++-
 package.json | 4 ++--
 yarn.lock    | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bea8dd4b9d8..c763b881441 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,11 @@
-FROM node:14.15.5-alpine3.13 as js-builder
+FROM node:15.11.0-alpine3.13 as js-builder
 
 WORKDIR /usr/src/app/
 
 COPY package.json yarn.lock ./
 COPY packages packages
 
+RUN apk --no-cache add git
 RUN yarn install --pure-lockfile --no-progress
 
 COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./
diff --git a/package.json b/package.json
index 360d2c5e0bb..84c8ad43b59 100644
--- a/package.json
+++ b/package.json
@@ -290,7 +290,7 @@
     "slate": "0.47.8",
     "slate-plain-serializer": "0.7.10",
     "tether": "1.4.7",
-    "tether-drop": "https://github.com/torkelo/drop/tarball/master",
+    "tether-drop": "https://github.com/torkelo/drop",
     "tinycolor2": "1.4.1",
     "tti-polyfill": "0.2.2",
     "uuid": "8.3.0",
@@ -299,7 +299,7 @@
   },
   "resolutions": {
     "caniuse-db": "1.0.30000772",
-    "react-use-measure": "https://github.com/mckn/react-use-measure.git#remove-cjs-export"
+    "react-use-measure": "https://github.com/mckn/react-use-measure#remove-cjs-export"
   },
   "workspaces": {
     "packages": [
diff --git a/yarn.lock b/yarn.lock
index 9858a859fc7..b1c03237dc0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -22202,9 +22202,9 @@ react-transition-group@^4.3.0:
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react-use-measure@2.0.1, "react-use-measure@https://github.com/mckn/react-use-measure.git#remove-cjs-export":
+react-use-measure@2.0.1, "react-use-measure@https://github.com/mckn/react-use-measure#remove-cjs-export":
   version "2.0.3"
-  resolved "https://github.com/mckn/react-use-measure.git#73530149cb2810cc629f73fa680f8681a0f398ca"
+  resolved "https://github.com/mckn/react-use-measure#73530149cb2810cc629f73fa680f8681a0f398ca"
   dependencies:
     debounce "^1.2.0"
 
@@ -25058,9 +25058,9 @@ test-value@^3.0.0:
     array-back "^2.0.0"
     typical "^2.6.1"
 
-"tether-drop@https://github.com/torkelo/drop/tarball/master":
+"tether-drop@https://github.com/torkelo/drop":
   version "1.5.0"
-  resolved "https://github.com/torkelo/drop/tarball/master#6a3eb15b882b416f06e1e7ae04c7e57d08418020"
+  resolved "https://github.com/torkelo/drop#fc83ca88db0076fbf6359cbe1743a9ef0f1ee6e1"
   dependencies:
     tether "^1.1.0"