From 53cf34d377745395cb5c09db6214aa6b88eb0cc7 Mon Sep 17 00:00:00 2001 From: Keno Dressel Date: Wed, 26 Jul 2023 20:43:06 +0200 Subject: [PATCH] chore: upgrades firebase --- package.json | 4 ++-- src/App.jsx | 2 +- src/firebase.js | 14 +++++++------- src/util/useCms.jsx | 2 +- src/util/useFirebaseDownload.jsx | 2 +- src/views/CompleteNotification.jsx | 2 +- src/views/Dashboard.jsx | 2 +- src/views/Signin.jsx | 2 +- src/views/Signup.jsx | 2 +- src/views/VerifyEmail.jsx | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index c81b2104..d720cf8f 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "@testing-library/user-event": "^7.1.2", "autoprefixer": "^9.7.4", "date-fns": "^2.10.0", - "firebase": "^7.11.0", + "firebase": "^10.1.0", "geofirestore": "^3.6.0", "google-map-react": "^1.1.7", "i18next": "^19.3.3", @@ -21,7 +21,7 @@ "postcss-cli": "^7.1.0", "react": "^16.13.0", "react-dom": "^16.13.0", - "react-firebase-hooks": "^2.1.1", + "react-firebase-hooks": "^5.1.1", "react-i18next": "^11.3.3", "react-router-dom": "^5.1.2", "react-scripts": "3.4.0", diff --git a/src/App.jsx b/src/App.jsx index 52868902..43e73aa4 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,6 +1,6 @@ import React, { Suspense } from 'react'; import { HashRouter as Router } from 'react-router-dom'; -import 'firebase/auth'; +import 'firebase/compat/auth'; import Routes from './components/Routes'; import Loader from './components/loader/Loader'; import './i18n'; diff --git a/src/firebase.js b/src/firebase.js index 739032e2..6c8fbbbc 100644 --- a/src/firebase.js +++ b/src/firebase.js @@ -1,10 +1,10 @@ -import * as app from 'firebase/app'; -import 'firebase/auth'; -import 'firebase/analytics'; -import 'firebase/firestore'; -import 'firebase/functions'; -import 'firebase/database'; -import 'firebase/storage'; +import app from 'firebase/compat/app'; +import 'firebase/compat/auth'; +import 'firebase/compat/analytics'; +import 'firebase/compat/firestore'; +import 'firebase/compat/functions'; +import 'firebase/compat/database'; +import 'firebase/compat/storage'; import config from './firebaseConfig'; class Firebase { diff --git a/src/util/useCms.jsx b/src/util/useCms.jsx index 1fe58c30..2751e8bd 100644 --- a/src/util/useCms.jsx +++ b/src/util/useCms.jsx @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react'; -import * as firebase from 'firebase/app'; +import firebase from 'firebase/compat/app'; import * as Sentry from '@sentry/browser'; import i18next from 'i18next'; diff --git a/src/util/useFirebaseDownload.jsx b/src/util/useFirebaseDownload.jsx index 6e7babfe..7cb0924c 100644 --- a/src/util/useFirebaseDownload.jsx +++ b/src/util/useFirebaseDownload.jsx @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react'; -import * as firebase from 'firebase/app'; +import firebase from 'firebase/compat/app'; export default function useFirebaseDownload(url) { const [link, setLink] = useState(''); diff --git a/src/views/CompleteNotification.jsx b/src/views/CompleteNotification.jsx index f75a7fce..0558ad50 100644 --- a/src/views/CompleteNotification.jsx +++ b/src/views/CompleteNotification.jsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from 'react'; import { useAuthState } from 'react-firebase-hooks/auth'; -import * as firebase from 'firebase/app'; +import firebase from 'firebase/compat/app'; import 'firebase/auth'; import * as Sentry from '@sentry/browser'; import { GeoFirestore } from 'geofirestore'; diff --git a/src/views/Dashboard.jsx b/src/views/Dashboard.jsx index e323d645..160baa4d 100644 --- a/src/views/Dashboard.jsx +++ b/src/views/Dashboard.jsx @@ -4,7 +4,7 @@ import { useAuthState } from 'react-firebase-hooks/auth'; import { useCollectionDataOnce } from 'react-firebase-hooks/firestore'; import { useTranslation } from 'react-i18next'; import Popup from 'reactjs-popup'; -import * as firebase from 'firebase/app'; +import firebase from 'firebase/compat/app'; import * as Sentry from '@sentry/browser'; import fb from '../firebase'; import Entry from '../components/entry/Entry'; diff --git a/src/views/Signin.jsx b/src/views/Signin.jsx index 7ac3c37c..caa007fb 100644 --- a/src/views/Signin.jsx +++ b/src/views/Signin.jsx @@ -8,7 +8,7 @@ import { useParams, useLocation, } from 'react-router-dom'; -import * as firebase from 'firebase/app'; +import firebase from 'firebase/compat/app'; import { useAuthState } from 'react-firebase-hooks/auth'; import MailInput from '../components/MailInput'; import fb from '../firebase'; diff --git a/src/views/Signup.jsx b/src/views/Signup.jsx index e543109b..b1f264d9 100644 --- a/src/views/Signup.jsx +++ b/src/views/Signup.jsx @@ -1,7 +1,7 @@ import React, { useRef, useState } from 'react'; import Collapse from '@material-ui/core/Collapse'; import { useDocumentDataOnce } from 'react-firebase-hooks/firestore'; -import * as firebase from 'firebase/app'; +import firebase from 'firebase/compat/app'; import 'firebase/auth'; import { Link, diff --git a/src/views/VerifyEmail.jsx b/src/views/VerifyEmail.jsx index 98ebcde2..1b1e20a3 100644 --- a/src/views/VerifyEmail.jsx +++ b/src/views/VerifyEmail.jsx @@ -2,8 +2,8 @@ import React from 'react'; import { Redirect } from 'react-router-dom'; import { useAuthState } from 'react-firebase-hooks/auth'; import { useTranslation } from 'react-i18next'; -import * as firebase from 'firebase/app'; -import 'firebase/auth'; +import firebase from 'firebase/compat/app'; +import 'firebase/compat/auth'; import { baseUrl } from '../appConfig'; import { useEmailVerified } from '../util/emailVerified';