Cleanup, upgrade schematic

jamesdaniels · jamesdaniels · commit 6fb0f6dae7fb · 2021-08-16T14:35:40.000-04:00
diff --git a/README.md b/README.md
@@ -24,9 +24,8 @@ AngularFire smooths over the rough edges an Angular developer might encounter wh
 
 ```ts
 import { Component } from '@angular/core';
-import { Firestore, collectionData } from '@angular/fire/firestore';
+import { Firestore, collectionData, collection } from '@angular/fire/firestore';
 import { Observable } from 'rxjs';
-import { collection } from 'firebase/firestore';
 
 interface Item {
   id: string,
diff --git a/sample/package.json b/sample/package.json
@@ -17,7 +17,7 @@
     "@angular/common": "^12.0.0",
     "@angular/compiler": "^12.0.0",
     "@angular/core": "^12.0.0",
-    "@angular/fire": "../dist/packages-dist",
+    "@angular/fire": "6.0.0",
     "@angular/forms": "^12.0.0",
     "@angular/platform-browser": "^12.0.0",
     "@angular/platform-browser-dynamic": "^12.0.0",
@@ -52,5 +52,8 @@
     "ts-node": "~9.1.1",
     "typescript": "~4.2.3",
     "webpack-bundle-analyzer": "^4.4.1"
+  },
+  "resolutions": {
+    "webpack": "^5.35.0"
   }
 }
diff --git a/sample/src/app/app.component.ts b/sample/src/app/app.component.ts
@@ -1,7 +1,7 @@
 import { ApplicationRef, Component, NgZone, Optional } from '@angular/core';
 import { FirebaseApp, FirebaseApps } from '@angular/fire/app';
 import { Auth, AuthInstances, authState } from '@angular/fire/auth';
-import { Firestore, FirestoreInstances } from '@angular/fire/firestore/lite';
+import { Firestore, FirestoreInstances } from '@angular/fire/firestore';
 import { firestoreInstance$ } from '@angular/fire/firestore';
 import { debounceTime } from 'rxjs/operators';
 import { initializeFirestore$ } from './firestore';
@@ -50,7 +50,6 @@ export class AppComponent {
     // onAuthStateChanged(auth, it => console.log('onAuthStateChanged', it));
     authState(auth).subscribe(it => console.log('authState', it));
     appRef.isStable.pipe(debounceTime(200)).subscribe(it => console.log('isStable', it));
-    console.log((app as any).container.providers.keys());
     firestoreInstance$.subscribe(it => console.log('$', it));
     initializeFirestore$.subscribe(it => console.log('init', it));
   }
diff --git a/sample/src/app/app.module.ts b/sample/src/app/app.module.ts
@@ -7,8 +7,6 @@ import { initializeAuth } from 'firebase/auth';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { environment } from '../environments/environment';
-import { provideFirestore } from '@angular/fire/firestore/lite';
-import { getFirestore } from 'firebase/firestore/lite';
 
 @NgModule({
   declarations: [
@@ -24,7 +22,6 @@ import { getFirestore } from 'firebase/firestore/lite';
       return app;
     }),
     provideAuth(() => initializeAuth(getApp())),
-    provideFirestore(() => getFirestore()),
   ],
   providers: [ ],
   bootstrap: [AppComponent]
diff --git a/sample/yarn.lock b/sample/yarn.lock
@@ -216,10 +216,10 @@
   dependencies:
     tslib "^2.2.0"
 
-"@angular/fire@../dist/packages-dist":
-  version "7.0.0"
-  dependencies:
-    tslib "^2.0.0"
+"@angular/fire@6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/fire/-/fire-6.0.0.tgz#c1dbae9e78ed74af951fb7222108c444300a4d15"
+  integrity sha512-zWhaJaZPtfJKiNSb1I3WqqvopW0fN3S61w4PjPdsm5WME+9M9alP0zpRVclpbCU26LpBSLhrRrSLyn3ROlAOIw==
 
 "@angular/forms@^12.0.0":
   version "12.1.3"
@@ -2152,6 +2152,11 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
     mime-types "~2.1.24"
     negotiator "0.6.2"
 
+acorn-import-assertions@^1.7.6:
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz#580e3ffcae6770eebeec76c3b9723201e9d01f78"
+  integrity sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA==
+
 acorn-walk@^8.0.0:
   version "8.1.1"
   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:
     ajv "^6.12.4"
     ajv-keywords "^3.5.2"
 
-schema-utils@^3.0.0:
+schema-utils@^3.0.0, schema-utils@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
   integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
@@ -9577,7 +9582,7 @@ socks@^2.3.3:
     ip "^1.1.5"
     smart-buffer "^4.1.0"
 
-source-list-map@^2.0.0, source-list-map@^2.0.1:
+source-list-map@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   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:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack-sources@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.1.tgz#570de0af163949fe272233c2cefe1b56f74511fd"
-  integrity sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==
-  dependencies:
-    source-list-map "^2.0.1"
-    source-map "^0.6.1"
+webpack-sources@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.0.tgz#b16973bcf844ebcdb3afde32eda1c04d0b90f89d"
+  integrity sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw==
 
 webpack-subresource-integrity@1.5.2:
   version "1.5.2"
@@ -10681,17 +10683,18 @@ webpack-subresource-integrity@1.5.2:
   dependencies:
     webpack-sources "^1.3.0"
 
-webpack@5.44.0:
-  version "5.44.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.44.0.tgz#97b13a02bd79fb71ac6301ce697920660fa214a1"
-  integrity sha512-I1S1w4QLoKmH19pX6YhYN0NiSXaWY8Ou00oA+aMcr9IUGeF5azns+IKBkfoAAG9Bu5zOIzZt/mN35OffBya8AQ==
+webpack@5.44.0, webpack@^5.35.0:
+  version "5.50.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.50.0.tgz#5562d75902a749eb4d75131f5627eac3a3192527"
+  integrity sha512-hqxI7t/KVygs0WRv/kTgUW8Kl3YC81uyWQSo/7WUs5LsuRw0htH/fCwbVBGCuiX/t4s7qzjXFcf41O8Reiypag==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.50"
     "@webassemblyjs/ast" "1.11.1"
     "@webassemblyjs/wasm-edit" "1.11.1"
     "@webassemblyjs/wasm-parser" "1.11.1"
     acorn "^8.4.1"
+    acorn-import-assertions "^1.7.6"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
     enhanced-resolve "^5.8.0"
@@ -10704,11 +10707,11 @@ webpack@5.44.0:
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^3.0.0"
+    schema-utils "^3.1.0"
     tapable "^2.1.1"
     terser-webpack-plugin "^5.1.3"
     watchpack "^2.2.0"
-    webpack-sources "^2.3.0"
+    webpack-sources "^3.2.0"
 
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
diff --git a/src/analytics/package.json b/src/analytics/package.json
@@ -3,7 +3,8 @@
   "ngPackage": {
     "lib": {
       "umdModuleIds": {
-        "rxfire/analytics": "rxfire-analytics"
+        "rxfire/analytics": "rxfire-analytics",
+        "firebase/analytics": "firebase-analytics"
       },
       "entryFile": "public_api.ts"
     }
diff --git a/src/app/package.json b/src/app/package.json
@@ -3,7 +3,8 @@
   "ngPackage": {
     "lib": {
       "umdModuleIds": {
-        "rxfire/app": "rxfire-app"
+        "rxfire/app": "rxfire-app",
+        "firebase/app": "firebase-app"
       },
       "entryFile": "public_api.ts"
     }
diff --git a/src/auth/package.json b/src/auth/package.json
@@ -3,7 +3,8 @@
   "ngPackage": {
     "lib": {
       "umdModuleIds": {
-        "rxfire/auth": "rxfire-auth"
+        "rxfire/auth": "rxfire-auth",
+        "firebase/auth": "firebase-auth"
       },
       "entryFile": "public_api.ts"
     }
diff --git a/src/builders.json b/src/builders.json
diff --git a/src/collection.json b/src/collection.json
diff --git a/src/database/package.json b/src/database/package.json
@@ -3,7 +3,8 @@
   "ngPackage": {
     "lib": {
       "umdModuleIds": {
-        "rxfire/database": "rxfire-database"
+        "rxfire/database": "rxfire-database",
+        "firebase/database": "firebase-database"
       },
       "entryFile": "public_api.ts"
     }
diff --git a/src/firestore/lite/package.json b/src/firestore/lite/package.json
@@ -3,7 +3,8 @@
   "ngPackage": {
     "lib": {
       "umdModuleIds": {
-        "rxfire/firestore-lite": "rxfire-firestore-lite"
+        "rxfire/firestore/lite": "rxfire-firestore-lite",
+        "firebase/firestore/lite": "firebase-firestore-lite"
       },
       "entryFile": "public_api.ts"
     }
diff --git a/src/firestore/package.json b/src/firestore/package.json
@@ -3,7 +3,8 @@
   "ngPackage": {
     "lib": {
       "umdModuleIds": {
-        "rxfire/firestore": "rxfire-firestore"
+        "rxfire/firestore": "rxfire-firestore",
+        "firebase/firestore": "firebase-firestore"
       },
       "entryFile": "public_api.ts"
     }
diff --git a/src/functions/package.json b/src/functions/package.json
@@ -3,7 +3,8 @@
   "ngPackage": {
     "lib": {
       "umdModuleIds": {
-        "rxfire/functions": "rxfire-functions"
+        "rxfire/functions": "rxfire-functions",
+        "firebase/functions": "firebase-functions"
       },
       "entryFile": "public_api.ts"
     }
diff --git a/src/messaging/package.json b/src/messaging/package.json
@@ -3,7 +3,8 @@
   "ngPackage": {
     "lib": {
       "umdModuleIds": {
-        "rxfire/messaging": "rxfire-messaging"
+        "rxfire/messaging": "rxfire-messaging",
+        "firebase/messaging": "firebase-messaging"
       },
       "entryFile": "public_api.ts"
     }
diff --git a/src/package.json b/src/package.json
@@ -3,8 +3,8 @@
   "name": "@angular/fire",
   "version": "ANGULARFIRE2_VERSION",
   "description": "The official Angular library for Firebase.",
-  "schematics": "./collection.json",
-  "builders": "./builders.json",
+  "schematics": "./schematics/collection.json",
+  "builders": "./schematics/builders.json",
   "keywords": [
     "angular",
     "firebase",
@@ -28,6 +28,7 @@
     "@angular/platform-browser": "ANGULAR_VERSION",
     "@angular/platform-browser-dynamic": "ANGULAR_VERSION",
     "firebase": "FIREBASE_VERSION",
+    "rxfire": "RXFIRE_VERSION",
     "rxjs": "RXJS_VERSION"
   },
   "dependencies": {
@@ -45,5 +46,8 @@
       "entryFile": "public_api.ts"
     },
     "dest": "../dist/packages-dist"
+  },
+  "ng-update": {
+    "migrations": "./schematics/migration.json"
   }
 }
diff --git a/src/performance/package.json b/src/performance/package.json
@@ -3,7 +3,8 @@
   "ngPackage": {
     "lib": {
       "umdModuleIds": {
-        "rxfire/performance": "rxfire-performance"
+        "rxfire/performance": "rxfire-performance",
+        "firebase/performance": "firebase-performance"
       },
       "entryFile": "public_api.ts"
     }
diff --git a/src/remote-config/package.json b/src/remote-config/package.json
@@ -3,7 +3,8 @@
   "ngPackage": {
     "lib": {
       "umdModuleIds": {
-        "rxfire/remote-config": "rxfire-remote-config"
+        "rxfire/remote-config": "rxfire-remote-config",
+        "firebase/remote-config": "firebase-remote-config"
       },
       "entryFile": "public_api.ts"
     }
diff --git a/src/schematics/builders.json b/src/schematics/builders.json
@@ -0,0 +1,10 @@
+{
+  "$schema": "../../node_modules/@angular-devkit/schematics/collection-schema.json",
+  "builders": {
+    "deploy": {
+      "implementation": "./deploy/builder",
+      "schema": "./deploy/schema.json",
+      "description": "Deploy builder"
+    }
+  }
+}
diff --git a/src/schematics/collection.json b/src/schematics/collection.json
@@ -0,0 +1,13 @@
+{
+  "$schema": "../../node_modules/@angular-devkit/schematics/collection-schema.json",
+  "schematics": {
+    "ng-add": {
+      "description": "Add firebase deploy schematic",
+      "factory": "./public_api#ngAdd"
+    },
+    "ng-add-setup-project": {
+      "description": "Setup ng deploy",
+      "factory": "./public_api#ngAddSetupProject"
+    }
+  }
+}
diff --git a/src/schematics/migration.json b/src/schematics/migration.json
@@ -0,0 +1,15 @@
+{
+    "$schema": "../../node_modules/@angular-devkit/schematics/collection-schema.json",
+    "schematics": {
+        "migration-v7": {
+            "version": "7.0.0",
+            "description": "Update @angular/fire to v7",
+            "factory": "./update/v7/index#ngUpdate"
+        },
+        "ng-post-upgate": {
+            "description": "Print out results after ng-update",
+            "factory": "./public-api#ngPostUpdate",
+            "private": true
+        }
+    }
+}
diff --git a/src/schematics/ng-update.ts b/src/schematics/ng-update.ts
@@ -0,0 +1,3 @@
+export const ngPostUpdate = () => () => {
+    console.log('something');
+};
diff --git a/src/schematics/public_api.ts b/src/schematics/public_api.ts
@@ -1,3 +1,4 @@
 export * from './ng-add';
 export * from './deploy/actions';
 export * from './deploy/builder';
+export * from './ng-update';
diff --git a/src/schematics/update/v7/index.ts b/src/schematics/update/v7/index.ts
diff --git a/src/storage/package.json b/src/storage/package.json
diff --git a/tools/build.ts b/tools/build.ts
