From b71bfc9fbe364fe3644ad760515161d7e83c29f1 Mon Sep 17 00:00:00 2001
From: Daofeng Li <lidaof@gmail.com>
Date: Wed, 12 Aug 2020 18:44:29 -0500
Subject: [PATCH] chore(components): remove lifecycle warning from using
 componentWillMount (#969)

---
 package-lock.json       |  2 +-
 package.json            |  2 +-
 src/firebaseConnect.js  |  6 ++++--
 src/firestoreConnect.js | 13 +++++++++----
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c2e17fc2d..1715bfa44 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "react-redux-firebase",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2d76a7d0e..62263f61f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-redux-firebase",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "Redux integration for Firebase. Comes with a Higher Order Components for use with React.",
   "main": "lib/index.js",
   "module": "es/index.js",
diff --git a/src/firebaseConnect.js b/src/firebaseConnect.js
index 0dc482c7c..ba3e1fb4a 100644
--- a/src/firebaseConnect.js
+++ b/src/firebaseConnect.js
@@ -26,7 +26,7 @@ import { v3ErrorMessage } from './constants'
  */
 export const createFirebaseConnect = (storeKey = 'store') => (
   dataOrFn = []
-) => WrappedComponent => {
+) => (WrappedComponent) => {
   class FirebaseConnect extends Component {
     static displayName = `FirebaseConnect(${getDisplayName(WrappedComponent)})`
     static wrappedComponent = WrappedComponent
@@ -39,7 +39,9 @@ export const createFirebaseConnect = (storeKey = 'store') => (
     prevData = null
     store = this.context[storeKey]
 
-    componentWillMount() {
+    /* eslint-disable camelcase */
+    UNSAFE_componentWillMount() {
+      /* eslint-enable camelcase */
       // Throw if using with react-redux@^6
       if (!this.context || !this.context[storeKey]) {
         // Use react-redux-firebase@^3 for react-redux@^6 support. More info available in the migration guide: http://bit.ly/2SRNdiO'
diff --git a/src/firestoreConnect.js b/src/firestoreConnect.js
index c7332a8b4..fda76f6b0 100644
--- a/src/firestoreConnect.js
+++ b/src/firestoreConnect.js
@@ -25,7 +25,7 @@ import { v3ErrorMessage } from './constants'
  */
 export const createFirestoreConnect = (storeKey = 'store') => (
   dataOrFn = []
-) => WrappedComponent => {
+) => (WrappedComponent) => {
   class FirestoreConnect extends Component {
     static wrappedComponent = WrappedComponent
     static displayName = wrapDisplayName(WrappedComponent, 'FirestoreConnect')
@@ -40,7 +40,9 @@ export const createFirestoreConnect = (storeKey = 'store') => (
       return !!this.store.firestore
     }
 
-    componentWillMount() {
+    /* eslint-disable camelcase */
+    UNSAFE_componentWillMount() {
+      /* eslint-enable camelcase */
       // Throw if using with react-redux@^6
       if (!this.context || !this.context[storeKey]) {
         // Use react-redux-firebase@^3 for react-redux@^6 support. More info available in the migration guide: http://bit.ly/2SRNdiO'
@@ -86,8 +88,11 @@ export const createFirestoreConnect = (storeKey = 'store') => (
 
     getChanges(data = [], prevData = []) {
       const result = {}
-      result.added = filter(data, d => !some(prevData, p => isEqual(d, p)))
-      result.removed = filter(prevData, p => !some(data, d => isEqual(p, d)))
+      result.added = filter(data, (d) => !some(prevData, (p) => isEqual(d, p)))
+      result.removed = filter(
+        prevData,
+        (p) => !some(data, (d) => isEqual(p, d))
+      )
       return result
     }