firebase · dackers86 · Nov 7, 2025 · Nov 7, 2025 · Nov 7, 2025 · Nov 7, 2025
diff --git a/eslint.config.ts b/eslint.config.ts
@@ -15,6 +15,8 @@ const config: any[] = [
     "**/node_modules/**",
     "**/build/**",
     "**/.next/**",
+    "**/out/**",
+    "**/.firebase/**",
     "**/.angular/**",
     "**/releases/**",
     "**/shadcn/public-dev/**",

diff --git a/examples/nextjs/.firebaserc b/examples/nextjs/.firebaserc
@@ -1,5 +1,5 @@
 {
   "projects": {
-    "default": "fir-ui-2025"
+    "default": "fir-ui-rework"
   }
 }
diff --git a/examples/nextjs/app/forgot-password/page.tsx b/examples/nextjs/app/forgot-password/page.tsx
@@ -14,16 +14,10 @@
  * limitations under the License.
  */
 
-import { getCurrentUser } from "@/lib/firebase/serverApp";
-import { redirect } from "next/navigation";
-import ForgotPasswordScreen from "./screen";
-
-export default async function ForgotPasswordPage() {
-  const { currentUser } = await getCurrentUser();
+"use client";
 
-  if (currentUser) {
-    return redirect("/");
-  }
+import ForgotPasswordScreen from "./screen";
 
+export default function ForgotPasswordPage() {
   return <ForgotPasswordScreen />;
 }
diff --git a/examples/nextjs/app/forgot-password/screen.tsx b/examples/nextjs/app/forgot-password/screen.tsx
@@ -16,11 +16,11 @@
 
 "use client";
 
-import { PasswordResetScreen } from "@invertase/firebaseui-react";
+import { ForgotPasswordAuthScreen } from "@invertase/firebaseui-react";
 import { useRouter } from "next/navigation";
 
 export default function Screen() {
   const router = useRouter();
 
-  return <PasswordResetScreen onBackToSignInClick={() => router.push("/sign-in")} />;
+  return <ForgotPasswordAuthScreen onBackToSignInClick={() => router.push("/sign-in")} />;
 }
diff --git a/examples/nextjs/app/layout.tsx b/examples/nextjs/app/layout.tsx
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-import { getCurrentUser } from "@/lib/firebase/serverApp";
-import { FirebaseUIProvider } from "@/lib/firebase/ui";
+// import { getCurrentUser } from "@/lib/firebase/serverApp";
 import type { Metadata } from "next";
 import { Geist, Geist_Mono } from "next/font/google";
+import { FirebaseUIProviderHoc } from "../lib/firebase/ui";
+// import { Header } from "@/lib/components/header";
 
-import { Header } from "@/lib/components/header";
 import "./globals.css";
+// import { useUser } from "@/lib/firebase/hooks";
 
 const geistSans = Geist({
   variable: "--font-geist-sans",
@@ -42,13 +43,13 @@ export default async function RootLayout({
 }: Readonly<{
   children: React.ReactNode;
 }>) {
-  const { currentUser } = await getCurrentUser();
+  // const user = await useUser();
 
   return (
     <html lang="en">
       <body className={`${geistSans.variable} ${geistMono.variable} antialiased`}>
-        <Header currentUser={currentUser} />
-        <FirebaseUIProvider>{children}</FirebaseUIProvider>
+        {/* <Header currentUser={{null}} /> */}
+        <FirebaseUIProviderHoc>{children}</FirebaseUIProviderHoc>
       </body>
     </html>
   );

diff --git a/examples/nextjs/app/register/page.tsx b/examples/nextjs/app/register/page.tsx
@@ -14,16 +14,10 @@
  * limitations under the License.
  */
 
-import { getCurrentUser } from "@/lib/firebase/serverApp";
-import { redirect } from "next/navigation";
-import RegisterScreen from "./screen";
-
-export default async function RegisterPage() {
-  const { currentUser } = await getCurrentUser();
+"use client";
 
-  if (currentUser) {
-    return redirect("/");
-  }
+import RegisterScreen from "./screen";
 
+export default function RegisterPage() {
   return <RegisterScreen />;
 }
diff --git a/examples/nextjs/app/register/screen.tsx b/examples/nextjs/app/register/screen.tsx
@@ -33,7 +33,7 @@ export default function Screen() {
   }, [user, router]);
 
   return (
-    <SignUpAuthScreen onBackToSignInClick={() => router.push("/sign-in")}>
+    <SignUpAuthScreen onSignInClick={() => router.push("/sign-in")}>
       <GoogleSignInButton />
     </SignUpAuthScreen>
   );

diff --git a/examples/nextjs/lib/examples/4/page.tsx → ...eens/forgot-password-auth-screen/page.tsx b/examples/nextjs/lib/examples/4/page.tsx → ...eens/forgot-password-auth-screen/page.tsx
@@ -1,4 +1,5 @@
 /**
+
  * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +17,8 @@
 
 "use client";
 
-import { SignInAuthScreen } from "@invertase/firebaseui-react";
+import { ForgotPasswordAuthScreen } from "@invertase/firebaseui-react";
 
-export default function Example4() {
-  return <SignInAuthScreen onForgotPasswordClick={() => {}} onRegisterClick={() => {}} />;
+export default function ForgotPasswordAuthScreenPage() {
+  return <ForgotPasswordAuthScreen onBackToSignInClick={() => {}} />;
 }
diff --git a/examples/nextjs/app/screens/password-reset-screen/page.tsx b/examples/nextjs/app/screens/password-reset-screen/page.tsx
@@ -16,8 +16,8 @@
 
 "use client";
 
-import { PasswordResetScreen } from "@invertase/firebaseui-react";
+import { ForgotPasswordAuthScreen } from "@invertase/firebaseui-react";
 
 export default function PasswordResetScreenPage() {
-  return <PasswordResetScreen onBackToSignInClick={() => {}} />;
+  return <ForgotPasswordAuthScreen onBackToSignInClick={() => {}} />;
 }
diff --git a/examples/nextjs/app/screens/phone-auth-screen/page.tsx b/examples/nextjs/app/screens/phone-auth-screen/page.tsx
@@ -19,5 +19,5 @@
 import { PhoneAuthScreen } from "@invertase/firebaseui-react";
 
 export default function PhoneAuthScreenPage() {
-  return <PhoneAuthScreen resendDelay={2} />;
+  return <PhoneAuthScreen />;
 }
diff --git a/examples/nextjs/app/screens/sign-in-auth-screen-w-handlers/page.tsx b/examples/nextjs/app/screens/sign-in-auth-screen-w-handlers/page.tsx
@@ -19,5 +19,11 @@
 import { SignInAuthScreen } from "@invertase/firebaseui-react";
 
 export default function SignInAuthScreenWithHandlersPage() {
-  return <SignInAuthScreen onForgotPasswordClick={() => {}} onRegisterClick={() => {}} />;
+  return (
+    <SignInAuthScreen
+      onSignIn={(credential) => {
+        console.log(credential);
+      }}
+    />
+  );
 }
diff --git a/examples/nextjs/app/screens/sign-in-auth-screen-w-oauth/page.tsx b/examples/nextjs/app/screens/sign-in-auth-screen-w-oauth/page.tsx
@@ -25,7 +25,9 @@ export default function SignInAuthScreenWithOAuthPage() {
   return (
     <SignInAuthScreen
       onForgotPasswordClick={() => router.push("/password-reset-screen")}
-      onRegisterClick={() => router.push("/sign-up-auth-screen")}
+      onSignIn={() => {
+        router.push("/");
+      }}
     >
       <GoogleSignInButton />
     </SignInAuthScreen>

diff --git a/examples/nextjs/app/sign-in/email/page.tsx b/examples/nextjs/app/sign-in/email/page.tsx
@@ -14,16 +14,10 @@
  * limitations under the License.
  */
 
-import { getCurrentUser } from "@/lib/firebase/serverApp";
-import { redirect } from "next/navigation";
-import EmailLinkAuthScreen from "./screen";
-
-export default async function SignInWithEmailLinkPage() {
-  const { currentUser } = await getCurrentUser();
+"use client";
 
-  if (currentUser) {
-    return redirect("/");
-  }
+import EmailLinkAuthScreen from "./screen";
 
+export default function SignInWithEmailLinkPage() {
   return <EmailLinkAuthScreen />;
 }
diff --git a/examples/nextjs/app/sign-in/page.tsx b/examples/nextjs/app/sign-in/page.tsx
@@ -14,16 +14,10 @@
  * limitations under the License.
  */
 
-import { getCurrentUser } from "@/lib/firebase/serverApp";
-import { redirect } from "next/navigation";
-import SignInScreen from "./screen";
-
-export default async function SignInPage() {
-  const { currentUser } = await getCurrentUser();
+"use client";
 
-  if (currentUser) {
-    return redirect("/");
-  }
+import SignInScreen from "./screen";
 
+export default function SignInPage() {
   return <SignInScreen />;
 }
diff --git a/examples/nextjs/app/sign-in/phone/page.tsx b/examples/nextjs/app/sign-in/phone/page.tsx
@@ -14,16 +14,10 @@
  * limitations under the License.
  */
 
-import { getCurrentUser } from "@/lib/firebase/serverApp";
-import { redirect } from "next/navigation";
-import SignInWithPhoneNumberScreen from "./screen";
-
-export default async function SignInWithPhoneNumberPage() {
-  const { currentUser } = await getCurrentUser();
+"use client";
 
-  if (currentUser) {
-    return redirect("/");
-  }
+import SignInWithPhoneNumberScreen from "./screen";
 
+export default function SignInWithPhoneNumberPage() {
   return <SignInWithPhoneNumberScreen />;
 }
diff --git a/examples/nextjs/app/sign-in/screen.tsx b/examples/nextjs/app/sign-in/screen.tsx
@@ -37,7 +37,7 @@ export default function Screen() {
   return (
     <SignInAuthScreen
       onForgotPasswordClick={() => router.push("/forgot-password")}
-      onRegisterClick={() => router.push("/register")}
+      onSignIn={() => router.push("/register")}
     >
       <GoogleSignInButton />
       <div>

diff --git a/examples/nextjs/firebase.json b/examples/nextjs/firebase.json
@@ -1,7 +1,7 @@
 {
   "hosting": {
-    "site": "fir-ui-2025-nextjs",
-    "source": ".",
+    "site": "fir-ui-rework-nextjs-ssg",
+    "public": "out",
     "ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
   }
 }