Merge branch '@invertase/v7-development' of https://github.com/firebase/firebaseui-web into @invertase/bb-44

Author: Ehesp

eslint.config.ts

@@ -71,7 +71,13 @@ const config: any[] = [
   },
   {
     // Test files - more lenient rules
-    files: ["**/*.test.{ts,tsx}", "**/*.spec.{ts,tsx}", "**/tests/**/*.{ts,tsx}"],
+    files: [
+      "**/*.test.{ts,tsx}",
+      "**/*.spec.{ts,tsx}",
+      "**/tests/**/*.{ts,tsx}",
+      // These are generated from shadcn, so we don't need to lint them
+      "examples/shadcn/src/components/**/*.tsx",
+    ],
     rules: {
       "@typescript-eslint/no-explicit-any": "off",
       "@typescript-eslint/no-unused-vars": "off",

examples/shadcn/add-all.ts

@@ -5,7 +5,7 @@ import { execSync } from "node:child_process";
 
 const components = registryJson.items.map((item) => item.name);
 const args = parser(process.argv.slice(2));
-const prefix = String(args.prefix) || "@dev";
+const prefix = args.prefix ? String(args.prefix) : "@dev";
 
 const rl = readline.createInterface({
   input: process.stdin,
@@ -18,6 +18,8 @@ const items = components
   })
   .join(" ");
 
+console.log(items);
+
 rl.question(
   `Add ${components.length} components. This will overrwrite all existing files. Continue? (y/N) `,
   (answer: unknown) => {

examples/shadcn/components.json

@@ -19,7 +19,7 @@
     "hooks": "@/hooks"
   },
   "registries": {
-    "@dev": "http://localhost:5178/{name}.json",
-    "@firebase-ui": "https://ui.firebase.com/{name}.json"
+    "@dev": "http://localhost:5177/r/{name}.json",
+    "@firebase-ui": "https://ui.firebase.com/r/{name}.json"
   }
 }

examples/shadcn/package.json

@@ -50,7 +50,7 @@
     "react": "catalog:",
     "react-day-picker": "^9.11.1",
     "react-dom": "catalog:",
-    "react-hook-form": "^7.64.0",
+    "react-hook-form": "^7.65.0",
     "react-resizable-panels": "^3.0.6",
     "react-router": "^7.9.3",
     "react-router-dom": "^6.28.0",

packages/shadcn/src/registry/apple-sign-in-button.tsx renamed to examples/shadcn/src/components/apple-sign-in-button.tsx

@@ -4,7 +4,7 @@ import { OAuthProvider } from "firebase/auth";
 import { getTranslation } from "@firebase-ui/core";
 import { useUI, type AppleSignInButtonProps, AppleLogo } from "@firebase-ui/react";
 
-import { OAuthButton } from "@/registry/oauth-button";
+import { OAuthButton } from "@/components/oauth-button";
 
 export type { AppleSignInButtonProps };
 

packages/shadcn/src/registry/country-selector.tsx renamed to examples/shadcn/src/components/country-selector.tsx

@@ -2,21 +2,20 @@
 
 import type { EmailLinkAuthFormSchema } from "@firebase-ui/core";
 import {
+  useUI,
   useEmailLinkAuthFormAction,
-  useEmailLinkAuthFormCompleteSignIn,
   useEmailLinkAuthFormSchema,
-  useUI,
+  useEmailLinkAuthFormCompleteSignIn,
   type EmailLinkAuthFormProps,
 } from "@firebase-ui/react";
-
-import { FirebaseUIError, getTranslation } from "@firebase-ui/core";
+import { useForm } from "react-hook-form";
 import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
+import { FirebaseUIError, getTranslation } from "@firebase-ui/core";
 import { useState } from "react";
-import { useForm } from "react-hook-form";
 
-import { Button } from "@/components/ui/button";
 import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import { Button } from "@/components/ui/button";
 import { Policies } from "./policies";
 
 export type { EmailLinkAuthFormProps };

examples/shadcn/src/components/email-link-auth-form.tsx

@@ -3,9 +3,9 @@
 import { getTranslation } from "@firebase-ui/core";
 import { useUI, type EmailLinkAuthScreenProps } from "@firebase-ui/react";
 
-import { EmailLinkAuthForm } from "@/components/email-link-auth-form";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
 import { Separator } from "@/components/ui/separator";
+import { EmailLinkAuthForm } from "@/components/email-link-auth-form";
 
 export type { EmailLinkAuthScreenProps };
 

examples/shadcn/src/components/email-link-auth-screen.tsx

@@ -4,7 +4,7 @@ import { FacebookAuthProvider } from "firebase/auth";
 import { getTranslation } from "@firebase-ui/core";
 import { useUI, type FacebookSignInButtonProps, FacebookLogo } from "@firebase-ui/react";
 
-import { OAuthButton } from "@/registry/oauth-button";
+import { OAuthButton } from "@/components/oauth-button";
 
 export type { FacebookSignInButtonProps };
 

packages/shadcn/src/registry/facebook-sign-in-button.tsx renamed to examples/shadcn/src/components/facebook-sign-in-button.tsx

@@ -3,8 +3,8 @@
 import { getTranslation } from "@firebase-ui/core";
 import { useUI, type ForgotPasswordAuthScreenProps } from "@firebase-ui/react";
 
-import { ForgotPasswordAuthForm } from "@/components/forgot-password-auth-form";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
+import { ForgotPasswordAuthForm } from "@/components/forgot-password-auth-form";
 
 export type { ForgotPasswordAuthScreenProps };