Skip to content

Commit 9e68dd7

Browse files
authored
Merge pull request #235 from medyo/fix-firebase-import
Fix firebase imports
2 parents 5d0aa25 + c54657d commit 9e68dd7

File tree

6 files changed

+14
-15
lines changed

6 files changed

+14
-15
lines changed

public/base.manifest.json

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,16 @@
22
"manifest_version": 3,
33
"name": "Hackertab.dev - developer news",
44
"description": "All developer news in one tab",
5-
"version": "1.23.1",
5+
"version": "1.23.2",
66
"chrome_url_overrides": {
77
"newtab": "index.html"
88
},
9-
"host_permissions": [
10-
"https://*.hackertab.dev/*"
11-
],
9+
"host_permissions": ["https://*.hackertab.dev/*"],
1210
"content_scripts": [
1311
{
14-
"matches": [
15-
"https://hackertab.dev/*"
16-
],
12+
"matches": ["https://hackertab.dev/*"],
1713
"run_at": "document_start",
18-
"js": [
19-
"content.js"
20-
]
14+
"js": ["content.js"]
2115
}
2216
],
2317
"icons": {

src/features/auth/components/AuthModal.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AuthProvider, GithubAuthProvider, GoogleAuthProvider } from 'firebase/auth'
1+
import { GithubAuthProvider, GoogleAuthProvider } from 'firebase/auth/web-extension'
22
import { useCallback, useState } from 'react'
33
import { FaGithub } from 'react-icons/fa'
44
import { FcGoogle } from 'react-icons/fc'
@@ -18,6 +18,7 @@ type AuthModalProps = {
1818
const googleAuthProvider = new GoogleAuthProvider()
1919
const githubAuthProvider = new GithubAuthProvider()
2020

21+
type AuthProvider = GoogleAuthProvider | GithubAuthProvider
2122
export const AuthModal = ({ showAuth }: AuthModalProps) => {
2223
const { closeAuthModal, authError, setAuthError } = useAuth()
2324
const [selectedProvider, setSelectedProvider] = useState<AuthProvider>(googleAuthProvider)

src/features/auth/hooks/useAuth.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { signOut } from 'firebase/auth'
1+
import { signOut } from 'firebase/auth/web-extension'
22
import { AuthModalStore, AuthStore } from 'src/features/auth'
33
import { trackUserDisconnect } from 'src/lib/analytics'
44
import { firebaseAuth } from 'src/lib/firebase'

src/lib/firebase.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { initializeApp } from 'firebase/app'
2-
import { getAuth } from 'firebase/auth'
2+
import { getAuth } from 'firebase/auth/web-extension'
33
import { FIREBASE_API_KEY } from 'src/config'
44

55
const firebaseConfig = {

src/providers/AuthProvider.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import { GithubAuthProvider, GoogleAuthProvider, signInWithCredential } from 'firebase/auth'
1+
import {
2+
GithubAuthProvider,
3+
GoogleAuthProvider,
4+
signInWithCredential,
5+
} from 'firebase/auth/web-extension'
26
import { useCallback, useEffect } from 'react'
37
import { useNavigate, useSearchParams } from 'react-router-dom'
48
import toast from 'react-simple-toasts'

src/stores/preferences.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export const useUserPreferences = create(
129129
theme: 'dark',
130130
onboardingCompleted: false,
131131
onboardingResult: null,
132-
searchEngine: 'chatgpt',
132+
searchEngine: 'google',
133133
searchEngines: [
134134
{
135135
label: 'Google',

0 commit comments

Comments
 (0)