Skip to content

Commit cc20ddc

Browse files
committed
Merge branch '@invertase/v7-development' of https://github.com/firebase/firebaseui-web into @invertase/v7-development
2 parents 153471f + 14a2848 commit cc20ddc

File tree

12 files changed

+34
-68
lines changed

12 files changed

+34
-68
lines changed

examples/angular/src/styles.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616

1717
/* You can add global styles to this file, and also import other style files */
1818
@import "tailwindcss";
19-
@import "@firebase-ui/styles/tailwind";
19+
@import "@invertase/firebaseui-styles/tailwind";

examples/react/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
"deploy": "pnpm run build && firebase deploy --only hosting:fir-ui-2025-react"
1212
},
1313
"dependencies": {
14-
"@invertase/firebaseui-react": "0.0.4",
15-
"@invertase/firebaseui-core": "0.0.4",
16-
"@invertase/firebaseui-styles": "0.0.9",
17-
"@invertase/firebaseui-translations": "0.0.4",
14+
"@invertase/firebaseui-react": "workspace:*",
15+
"@invertase/firebaseui-core": "workspace:*",
16+
"@invertase/firebaseui-styles": "workspace:*",
17+
"@invertase/firebaseui-translations": "workspace:*",
1818
"firebase": "^11.6.0",
1919
"react": "catalog:",
2020
"react-dom": "catalog:",

examples/react/src/App.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { routes } from "./routes";
1919
import { useUser } from "./firebase/hooks";
2020
import { auth } from "./firebase/firebase";
2121
import { multiFactor, sendEmailVerification, signOut } from "firebase/auth";
22-
import { MultiFactorAuthAssertionScreen, useUI } from "@firebase-ui/react";
22+
import { useUI } from "@invertase/firebaseui-react";
2323

2424
function App() {
2525
const user = useUser();
@@ -35,9 +35,9 @@ function UnauthenticatedApp() {
3535
const ui = useUI();
3636

3737
// This can trigger if the user is not on a screen already, and gets an MFA challenge - e.g. on One-Tap sign in.
38-
if (ui.multiFactorResolver) {
39-
return <MultiFactorAuthAssertionScreen />;
40-
}
38+
// if (ui.multiFactorResolver) {
39+
// return <MultiFactorAuthAssertionScreen />;
40+
// }
4141

4242
return (
4343
<div className="max-w-sm mx-auto pt-36 space-y-6 pb-36">

examples/react/src/firebase/firebase.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import { initializeApp, getApps } from "firebase/app";
2020
import { firebaseConfig } from "./config";
2121
import { connectAuthEmulator, getAuth } from "firebase/auth";
22-
import { initializeUI, oneTapSignIn, countryCodes } from "@firebase-ui/core";
22+
import { initializeUI, oneTapSignIn, countryCodes } from "@invertase/firebaseui-core";
2323

2424
export const firebaseApp = getApps().length === 0 ? initializeApp(firebaseConfig) : getApps()[0];
2525

examples/react/src/index.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
@custom-variant dark (&:where(.dark, .dark *));
1919
@import "@invertase/firebaseui-styles/tailwind";
2020

21-
/* @import "@firebase-ui/styles/src/themes/dark.css"; */
22-
/* @import "@firebase-ui/styles/src/themes/brutalist.css"; */
21+
/* @import "@invertase/firebaseui-styles/src/themes/dark.css"; */
22+
/* @import "@invertase/firebaseui-styles/src/themes/brutalist.css"; */

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"build:styles": "pnpm --filter=@invertase/firebaseui-styles run build",
1111
"build:react": "pnpm --filter=@invertase/firebaseui-react run build",
1212
"build:angular": "pnpm --filter=@invertase/firebaseui-angular run build",
13-
"build:shadcn": "pnpm --filter=@firebase-ui/shadcn run build",
13+
"build:shadcn": "pnpm --filter=@invertase/firebaseui-shadcn run build",
1414
"build:examples": "pnpm run build && pnpm --filter react run build && pnpm --filter nextjs run build && pnpm --filter angular-example run build",
1515
"build:all": "pnpm run build && pnpm run build:angular && pnpm run build:examples",
1616
"build:packages": "pnpm run build && pnpm run build:angular",

packages/react/src/context.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { useStore } from "@nanostores/react";
1919
import { type PolicyProps, PolicyProvider } from "~/components/policies";
2020
import { createContext } from "react";
2121

22-
export const FirebaseUIContext = createContext<FirebaseUI>({} as FirebaseUI);
22+
export const FirebaseUIContext = createContext<FirebaseUI>(null as unknown as FirebaseUI);
2323

2424
export type FirebaseUIProviderProps = {
2525
children: React.ReactNode;

packages/react/src/hooks.test.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,10 @@ describe("useUI", () => {
6363
expect(result.current).toEqual(mockUI.get());
6464
});
6565

66-
// TODO(ehesp): This test is not working as expected.
67-
it.skip("throws an error if no context is found", () => {
66+
it("throws an error if no context is found", () => {
6867
expect(() => {
6968
renderHook(() => useUI());
70-
}).toThrow("No FirebaseUI context found. Your application must be wrapped in a <FirebaseUIProvider> component.");
69+
}).toThrow();
7170
});
7271

7372
it("returns updated values when nanostore state changes via setState", () => {

packages/react/src/hooks.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,14 @@ export function useUI() {
4040

4141
if (!ui) {
4242
throw new Error(
43-
"No FirebaseUI context found. Your application must be wrapped in a <FirebaseUIProvider> component."
43+
`No FirebaseUI context found. Your application must be wrapped in a FirebaseUIProvider:
44+
45+
const ui = initializeUI(...);
46+
47+
<FirebaseUIProvider ui={ui}>
48+
<App />
49+
</FirebaseUIProvider>
50+
`
4451
);
4552
}
4653

packages/shadcn/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@firebase-ui/shadcn",
2+
"name": "@invertase/firebaseui-shadcn",
33
"private": true,
44
"version": "0.0.0",
55
"type": "module",

0 commit comments

Comments
 (0)