Skip to content

Commit c2579d2

Browse files
Merge branch 'main' into fix/functions-logger-compat-path
2 parents 7677de4 + 3b1096f commit c2579d2

10 files changed

Lines changed: 19 additions & 108 deletions

File tree

docs/analytics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ As a prerequisite, ensure that `AngularFire` has been added to your project via
1717
ng add @angular/fire
1818
```
1919

20-
Provide a Analytics instance in the application's `app.config.ts`:
20+
Provide an Analytics instance in the application's `app.config.ts`:
2121

2222
```ts
2323
import { provideFirebaseApp, initializeApp } from '@angular/fire/app';

docs/app-check.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ As a prerequisite, ensure that `AngularFire` has been added to your project via
1717
ng add @angular/fire
1818
```
1919

20-
Provide a App Check instance in the application's `app.config.ts`:
20+
Provide an App Check instance in the application's `app.config.ts`:
2121

2222
```ts
2323
import { provideFirebaseApp, initializeApp } from '@angular/fire/app';
@@ -54,4 +54,4 @@ AngularFire wraps the Firebase JS SDK to ensure proper functionality in Angular,
5454

5555
Update the imports from `import { ... } from 'firebase/app-check'` to `import { ... } from '@angular/fire/app-check'` and follow the official documentation.
5656

57-
[Getting Started](https://firebase.google.com/docs/app-check/web/recaptcha-enterprise-provider) | [API Reference](https://firebase.google.com/docs/reference/js/app-check)
57+
[Getting Started](https://firebase.google.com/docs/app-check/web/recaptcha-provider) | [API Reference](https://firebase.google.com/docs/reference/js/app-check)

docs/auth.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ As a prerequisite, ensure that `AngularFire` has been added to your project via
2020
ng add @angular/fire
2121
```
2222

23-
Provide a Auth instance in the application's `app.config.ts`:
23+
Provide an Auth instance in the application's `app.config.ts`:
2424

2525
```ts
2626
import { provideFirebaseApp, initializeApp } from '@angular/fire/app';

docs/compat.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AngularFire
2-
The official [Angular](https://angular.io/) library for [Firebase](https://firebase.google.com/).
2+
The official [Angular](https://angular.dev/) library for [Firebase](https://firebase.google.com/).
33

44
<strong><pre>ng add @angular/fire</pre></strong>
55

docs/compat/auth/router-guards.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Route users with AngularFire guards
22

3-
`AngularFireAuthGuard` provides a prebuilt [`canActivate` Router Guard](https://angular.io/api/router/CanActivate) using `AngularFireAuth`. By default unauthenticated users are not permitted to navigate to protected routes:
3+
`AngularFireAuthGuard` provides a prebuilt [`canActivate` Router Guard](https://angular.dev/api/router/CanActivate) using `AngularFireAuth`. By default unauthenticated users are not permitted to navigate to protected routes:
44

55
> **NOTE**: [AngularFire has a new tree-shakable API](../../../README.md#developer-guide), you're looking at the documentation for the compatability version of the library. [See the v7 upgrade guide for more information on this change.](../../version-7-upgrade.md).
66

docs/firebase.json

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

docs/install-angular-cli-windows10.md

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

docs/zones.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Instability can be difficult to track down. To help with debugging, AngularFire
5858
There are three logging levels in AngularFire:
5959

6060
* **Silent**: when the logging level is set to silent only the above banner is displayed when AngularFire APIs are called outside of an injection context, this is the default when using Zoneless change-detection.
61-
* **Warn**: when the logging level is set to warn, only blocking reads, long-lived tasks, and APIs with high risk of destabilizing your application are called, this is the default when using ZoneJS.
61+
* **Warn**: when the logging level is set to warn, only blocking reads, long-lived tasks, and APIs with high risk of destabilizing your application are logged, this is the default when using ZoneJS.
6262
* **Verbose**: when the logging level is set to verbose, all AngularFire APIs called outside of an injection context are logged—helping you track down APIs that may be destabilizing your application
6363

6464
You can change the log-level like so:

src/schematics/setup/index.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
createFirestoreStarterFiles,
2222
setDefaultProjectInFirebaseRc,
2323
} from './firebaseConfigs';
24-
import { appPrompt, featuresPrompt, projectPrompt, userPrompt } from './prompts';
24+
import { appPrompt, featuresPrompt, featuresPromptMessage, projectPrompt, userPrompt } from './prompts';
2525

2626
// FirebaseOptions keys — apps.sdkconfig responses include management-API extras that initializeApp() rejects.
2727
const firebaseOptionsKeys = [
@@ -67,7 +67,14 @@ export const ngAddSetupProject = (
6767

6868
const features = await featuresPrompt();
6969

70-
if (features.length > 0) {
70+
if (features.length === 0) {
71+
context.logger.warn(
72+
'No features were selected, so there is nothing to set up. ' +
73+
`At the "${featuresPromptMessage}" prompt, use the arrow keys to move, ` +
74+
'press Space to select each feature you want, then Enter to confirm. ' +
75+
'Re-run ng add @angular/fire to try again.'
76+
);
77+
} else {
7178

7279
const firebaseTools = await getFirebaseTools();
7380

src/schematics/setup/prompts.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,14 @@ type Prompt = <K extends string, U= unknown>(questions: { name: K, source: (...a
7979
const autocomplete: Prompt = (questions) => inquirer.prompt(questions);
8080

8181

82+
export const featuresPromptMessage = 'What features would you like to setup?';
83+
8284
export const featuresPrompt = async (): Promise<FEATURES[]> => {
8385
const { features } = await inquirer.prompt({
8486
type: 'checkbox',
8587
name: 'features',
8688
choices: featureOptions,
87-
message: 'What features would you like to setup?',
89+
message: featuresPromptMessage,
8890
default: [],
8991
}) as { features: FEATURES[] };
9092
return features;

0 commit comments

Comments
 (0)