Skip to content

Commit 6fb0f6d

Browse files
jamesdanielsjamesdaniels
committed
Cleanup, upgrade schematic
1 parent 6445e29 commit 6fb0f6d

File tree

26 files changed

+154
-65
lines changed

26 files changed

+154
-65
lines changed

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ AngularFire smooths over the rough edges an Angular developer might encounter wh
2424

2525
```ts
2626
import { Component } from '@angular/core';
27-
import { Firestore, collectionData } from '@angular/fire/firestore';
27+
import { Firestore, collectionData, collection } from '@angular/fire/firestore';
2828
import { Observable } from 'rxjs';
29-
import { collection } from 'firebase/firestore';
3029

3130
interface Item {
3231
id: string,

‎sample/package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@angular/common": "^12.0.0",
1818
"@angular/compiler": "^12.0.0",
1919
"@angular/core": "^12.0.0",
20-
"@angular/fire": "../dist/packages-dist",
20+
"@angular/fire": "6.0.0",
2121
"@angular/forms": "^12.0.0",
2222
"@angular/platform-browser": "^12.0.0",
2323
"@angular/platform-browser-dynamic": "^12.0.0",
@@ -52,5 +52,8 @@
5252
"ts-node": "~9.1.1",
5353
"typescript": "~4.2.3",
5454
"webpack-bundle-analyzer": "^4.4.1"
55+
},
56+
"resolutions": {
57+
"webpack": "^5.35.0"
5558
}
5659
}

‎sample/src/app/app.component.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ApplicationRef, Component, NgZone, Optional } from '@angular/core';
22
import { FirebaseApp, FirebaseApps } from '@angular/fire/app';
33
import { Auth, AuthInstances, authState } from '@angular/fire/auth';
4-
import { Firestore, FirestoreInstances } from '@angular/fire/firestore/lite';
4+
import { Firestore, FirestoreInstances } from '@angular/fire/firestore';
55
import { firestoreInstance$ } from '@angular/fire/firestore';
66
import { debounceTime } from 'rxjs/operators';
77
import { initializeFirestore$ } from './firestore';
@@ -50,7 +50,6 @@ export class AppComponent {
5050
// onAuthStateChanged(auth, it => console.log('onAuthStateChanged', it));
5151
authState(auth).subscribe(it => console.log('authState', it));
5252
appRef.isStable.pipe(debounceTime(200)).subscribe(it => console.log('isStable', it));
53-
console.log((app as any).container.providers.keys());
5453
firestoreInstance$.subscribe(it => console.log('$', it));
5554
initializeFirestore$.subscribe(it => console.log('init', it));
5655
}

‎sample/src/app/app.module.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import { initializeAuth } from 'firebase/auth';
77
import { AppRoutingModule } from './app-routing.module';
88
import { AppComponent } from './app.component';
99
import { environment } from '../environments/environment';
10-
import { provideFirestore } from '@angular/fire/firestore/lite';
11-
import { getFirestore } from 'firebase/firestore/lite';
1210

1311
@NgModule({
1412
declarations: [
@@ -24,7 +22,6 @@ import { getFirestore } from 'firebase/firestore/lite';
2422
return app;
2523
}),
2624
provideAuth(() => initializeAuth(getApp())),
27-
provideFirestore(() => getFirestore()),
2825
],
2926
providers: [ ],
3027
bootstrap: [AppComponent]

‎sample/yarn.lock‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,10 @@
216216
dependencies:
217217
tslib "^2.2.0"
218218

219-
"@angular/fire@../dist/packages-dist":
220-
version "7.0.0"
221-
dependencies:
222-
tslib "^2.0.0"
219+
"@angular/fire@6.0.0":
220+
version "6.0.0"
221+
resolved "https://registry.yarnpkg.com/@angular/fire/-/fire-6.0.0.tgz#c1dbae9e78ed74af951fb7222108c444300a4d15"
222+
integrity sha512-zWhaJaZPtfJKiNSb1I3WqqvopW0fN3S61w4PjPdsm5WME+9M9alP0zpRVclpbCU26LpBSLhrRrSLyn3ROlAOIw==
223223

224224
"@angular/forms@^12.0.0":
225225
version "12.1.3"
@@ -2152,6 +2152,11 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
21522152
mime-types "~2.1.24"
21532153
negotiator "0.6.2"
21542154

2155+
acorn-import-assertions@^1.7.6:
2156+
version "1.7.6"
2157+
resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz#580e3ffcae6770eebeec76c3b9723201e9d01f78"
2158+
integrity sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA==
2159+
21552160
acorn-walk@^8.0.0:
21562161
version "8.1.1"
21572162
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.1.1.tgz#3ddab7f84e4a7e2313f6c414c5b7dac85f4e3ebc"
@@ -9243,7 +9248,7 @@ schema-utils@^2.6.5, schema-utils@^2.7.0:
92439248
ajv "^6.12.4"
92449249
ajv-keywords "^3.5.2"
92459250

9246-
schema-utils@^3.0.0:
9251+
schema-utils@^3.0.0, schema-utils@^3.1.0:
92479252
version "3.1.1"
92489253
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
92499254
integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
@@ -9577,7 +9582,7 @@ socks@^2.3.3:
95779582
ip "^1.1.5"
95789583
smart-buffer "^4.1.0"
95799584

9580-
source-list-map@^2.0.0, source-list-map@^2.0.1:
9585+
source-list-map@^2.0.0:
95819586
version "2.0.1"
95829587
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
95839588
integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
@@ -10666,13 +10671,10 @@ webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0:
1066610671
source-list-map "^2.0.0"
1066710672
source-map "~0.6.1"
1066810673

10669-
webpack-sources@^2.3.0:
10670-
version "2.3.1"
10671-
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.1.tgz#570de0af163949fe272233c2cefe1b56f74511fd"
10672-
integrity sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==
10673-
dependencies:
10674-
source-list-map "^2.0.1"
10675-
source-map "^0.6.1"
10674+
webpack-sources@^3.2.0:
10675+
version "3.2.0"
10676+
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.0.tgz#b16973bcf844ebcdb3afde32eda1c04d0b90f89d"
10677+
integrity sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw==
1067610678

1067710679
[email protected]:
1067810680
version "1.5.2"
@@ -10681,17 +10683,18 @@ [email protected]:
1068110683
dependencies:
1068210684
webpack-sources "^1.3.0"
1068310685

10684-
[email protected]:
10685-
version "5.44.0"
10686-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.44.0.tgz#97b13a02bd79fb71ac6301ce697920660fa214a1"
10687-
integrity sha512-I1S1w4QLoKmH19pX6YhYN0NiSXaWY8Ou00oA+aMcr9IUGeF5azns+IKBkfoAAG9Bu5zOIzZt/mN35OffBya8AQ==
10686+
[email protected], webpack@^5.35.0:
10687+
version "5.50.0"
10688+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.50.0.tgz#5562d75902a749eb4d75131f5627eac3a3192527"
10689+
integrity sha512-hqxI7t/KVygs0WRv/kTgUW8Kl3YC81uyWQSo/7WUs5LsuRw0htH/fCwbVBGCuiX/t4s7qzjXFcf41O8Reiypag==
1068810690
dependencies:
1068910691
"@types/eslint-scope" "^3.7.0"
1069010692
"@types/estree" "^0.0.50"
1069110693
"@webassemblyjs/ast" "1.11.1"
1069210694
"@webassemblyjs/wasm-edit" "1.11.1"
1069310695
"@webassemblyjs/wasm-parser" "1.11.1"
1069410696
acorn "^8.4.1"
10697+
acorn-import-assertions "^1.7.6"
1069510698
browserslist "^4.14.5"
1069610699
chrome-trace-event "^1.0.2"
1069710700
enhanced-resolve "^5.8.0"
@@ -10704,11 +10707,11 @@ [email protected]:
1070410707
loader-runner "^4.2.0"
1070510708
mime-types "^2.1.27"
1070610709
neo-async "^2.6.2"
10707-
schema-utils "^3.0.0"
10710+
schema-utils "^3.1.0"
1070810711
tapable "^2.1.1"
1070910712
terser-webpack-plugin "^5.1.3"
1071010713
watchpack "^2.2.0"
10711-
webpack-sources "^2.3.0"
10714+
webpack-sources "^3.2.0"
1071210715

1071310716
websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
1071410717
version "0.7.4"

‎src/analytics/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"ngPackage": {
44
"lib": {
55
"umdModuleIds": {
6-
"rxfire/analytics": "rxfire-analytics"
6+
"rxfire/analytics": "rxfire-analytics",
7+
"firebase/analytics": "firebase-analytics"
78
},
89
"entryFile": "public_api.ts"
910
}

‎src/app/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"ngPackage": {
44
"lib": {
55
"umdModuleIds": {
6-
"rxfire/app": "rxfire-app"
6+
"rxfire/app": "rxfire-app",
7+
"firebase/app": "firebase-app"
78
},
89
"entryFile": "public_api.ts"
910
}

‎src/auth/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"ngPackage": {
44
"lib": {
55
"umdModuleIds": {
6-
"rxfire/auth": "rxfire-auth"
6+
"rxfire/auth": "rxfire-auth",
7+
"firebase/auth": "firebase-auth"
78
},
89
"entryFile": "public_api.ts"
910
}

‎src/builders.json‎

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

‎src/collection.json‎

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

0 commit comments

Comments
 (0)