Skip to content

Commit df5b407

Browse files
committed
chore(*): merged latest
2 parents 652322d + cc20ddc commit df5b407

File tree

17 files changed

+85
-168
lines changed

17 files changed

+85
-168
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"; */

examples/shadcn/components.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
},
2121
"registries": {
2222
"@dev": "http://localhost:5177/r/{name}.json",
23-
"@firebase-ui": "https://ui.firebase.com/r/{name}.json"
23+
"@firebase": "https://fir-ui-shadcn-registry.web.app/r/{name}.json"
2424
}
2525
}

examples/shadcn/firebase.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

examples/shadcn/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"build": "vite build",
99
"lint": "eslint .",
1010
"preview": "vite preview",
11-
"deploy": "pnpm run build && firebase deploy --only hosting:fir-ui-2025-shadcn",
1211
"shadcn:add-all": "tsx add-all.ts"
1312
},
1413
"dependencies": {

firebase.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,19 @@
1010
},
1111
"hosting": [
1212
{
13-
"site": "fir-ui-shadcn",
13+
"site": "fir-ui-shadcn-registry",
1414
"public": "packages/shadcn/public"
15+
},
16+
{
17+
"site": "fir-ui-shadcn",
18+
"public": "examples/shadcn/dist",
19+
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
20+
"rewrites": [
21+
{
22+
"source": "**",
23+
"destination": "/index.html"
24+
}
25+
]
1526
}
1627
]
1728
}

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@
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",
1717
"deploy": "pnpm run build && pnpm --filter react run deploy && pnpm --filter nextjs run deploy && pnpm --filter angular-example run deploy",
1818
"deploy:react": "pnpm --filter react run deploy",
1919
"deploy:nextjs": "pnpm --filter nextjs run deploy",
2020
"deploy:angular": "pnpm --filter angular-example run deploy",
21-
"shadcn:deploy": "pnpm run build:shadcn && firebase deploy --only hosting:fir-ui-shadcn",
21+
"deploy:shadcn": "pnpm run build:shadcn && firebase deploy --only hosting:fir-ui-shadcn",
22+
"deploy:all": "pnpm run build && pnpm run build:shadcn && pnpm --filter react run deploy && pnpm --filter nextjs run deploy && pnpm --filter angular-example run deploy && pnpm --filter shadcn run deploy",
2223
"lint:check": "eslint",
2324
"lint:fix": "eslint --fix",
2425
"format:check": "prettier --check **/{src,tests}/**/*.{ts,tsx}",

0 commit comments

Comments
 (0)