Merge pull request #6493 from spwoodcock/fix/react-placeholder

Fix react-placeholder peerDependency conflict (React v18)

frontend/package.json

@@ -53,7 +53,7 @@
     "react-hot-toast": "^2.4.1",
     "react-intl": "^6.4.4",
     "react-meta-elements": "^1.0.0",
-    "react-placeholder": "^4.1.0",
+    "react-placeholder": "git+https://github.com/hotosm/react-placeholder.git",
     "react-redux": "^8.1.1",
     "react-router-dom": "^6.13.0",
     "react-select": "^5.7.3",

frontend/yarn.lock

@@ -12258,10 +12258,9 @@ react-onclickoutside@^6.13.0:
   resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.13.0.tgz#e165ea4e5157f3da94f4376a3ab3e22a565f4ffc"
   integrity sha512-ty8So6tcUpIb+ZE+1HAhbLROvAIJYyJe/1vRrrcmW+jLsaM+/powDRqxzo6hSh9CuRZGSL1Q8mvcF5WRD93a0A==
 
-react-placeholder@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/react-placeholder/-/react-placeholder-4.1.0.tgz#943128820b3b0a6f94371655aadec18d306e05e3"
-  integrity sha512-z1HGD86NWJTYTQumHsmGH9jkozv4QHa9dju/vHVUd4f1svu23pf5v7QoBLBfs3kA1S9GLJaCeRMHLbO2SCdz5A==
+"react-placeholder@git+https://github.com/hotosm/react-placeholder.git":
+  version "4.2.0"
+  resolved "git+https://github.com/hotosm/react-placeholder.git#ef6301c4a017b91513c2c4b091d291d82d8b5916"
 
 react-popper@^2.3.0:
   version "2.3.0"

scripts/docker/Dockerfile.frontend

@@ -4,7 +4,8 @@ WORKDIR /usr/src/app/frontend
 COPY frontend .
 
 ## SETUP
-RUN npm install
+RUN git config --global url.https://github.com/.insteadOf [email protected]: \
+    && npm install --ignore-scripts
 
 # SERVE
 COPY tasking-manager.env ..