chore(release): 7.0.2 (#2911)

Author: jamesdaniels

CHANGELOG.md

@@ -1,3 +1,10 @@
+<a name="7.0.2"></a>
+# [7.0.2](https://github.com/angular/angularfire2/compare/7.0.1...7.0.2) (2021-08-30)
+
+### Bug fixes
+
+* **types:** `firebase/*` types were not being reexported from the `@angular/fire/*` modules (modular)
+
 <a name="7.0.1"></a>
 # [7.0.1](https://github.com/angular/angularfire2/compare/7.0.0...7.0.1) (2021-08-30)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/fire",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "description": "The official Angular library for Firebase.",
   "private": true,
   "scripts": {
@@ -93,6 +93,7 @@
     "codelyzer": "^6.0.0",
     "concurrently": "^2.2.0",
     "conventional-changelog-cli": "^1.2.0",
+    "file-loader": "^6.2.0",
     "firebase-functions-test": "^0.2.2",
     "globalthis": "^1.0.1",
     "gzip-size": "^5.1.1",

sample-compat/firestore-protos.ts

@@ -14,8 +14,7 @@ global['XMLHttpRequest'] = require('xhr2');
 global['WebSocket'] = require('ws');
 /* tslint:enable:no-string-literal */
 
-// include the protos required to bundle firestore
-// import 'dir-loader!./firestore-protos';
+import '@angular/fire/firestore-protos';
 
 // The Express app is exported so that it can be used by serverless Functions.
 export function app() {

sample-compat/server.ts

@@ -88,7 +88,7 @@ import { UpboatsComponent } from './upboats/upboats.component';
     { provide: REMOTE_CONFIG_DEFAULTS, useValue: { background_color: 'red' } },
     { provide: USE_DEVICE_LANGUAGE, useValue: true },
     { provide: VAPID_KEY, useValue: environment.vapidKey },
-    { provide: SERVICE_WORKER, useFactory: () => typeof navigator !== 'undefined' && navigator.serviceWorker?.register('firebase-messaging-sw.js') || undefined },
+    { provide: SERVICE_WORKER, useFactory: () => typeof navigator !== 'undefined' && navigator.serviceWorker?.register('firebase-messaging-sw.js', { scope: '__' }) || undefined },
     { provide: APP_VERSION, useValue: '0.0.0' },
     { provide: APP_NAME, useValue: 'Angular' },
   ],

sample-compat/src/app/app.module.ts

@@ -1,5 +1,5 @@
-importScripts('https://www.gstatic.com/firebasejs/9.0.0-20217250818/firebase-app-compat.js');
-importScripts('https://www.gstatic.com/firebasejs/9.0.0-20217250818/firebase-messaging-compat.js');
+importScripts('https://www.gstatic.com/firebasejs/9.0.1/firebase-app-compat.js');
+importScripts('https://www.gstatic.com/firebasejs/9.0.1/firebase-messaging-compat.js');
 
 firebase.initializeApp({
     apiKey: 'AIzaSyA7CNE9aHbcSEbt9y03QReJ-Xr0nwKg7Yg',

sample-compat/src/firebase-messaging-sw.js

@@ -10,8 +10,7 @@
   },
   "files": [
     "src/main.server.ts",
-    "server.ts",
-    "firestore-protos.ts"
+    "server.ts"
   ],
   "angularCompilerOptions": {
     "entryModule": "./src/app/app.server.module#AppServerModule"

sample-compat/tsconfig.server.json

@@ -49,6 +49,7 @@
     "@types/express": "^4.17.0",
     "@types/jasmine": "~3.6.0",
     "@types/node": "^12.11.1",
+    "file-loader": "^6.2.0",
     "firebase-tools": "^9.0.0",
     "fuzzy": "^0.1.3",
     "inquirer": "^6.2.2",
@@ -71,4 +72,4 @@
   "resolutions": {
     "webpack": "^5.35.0"
   }
-}
+}

sample-compat/yarn.lock

@@ -8,16 +8,14 @@ import { AppServerModule } from './src/main.server';
 import { APP_BASE_HREF } from '@angular/common';
 import { existsSync } from 'fs';
 
-// Polyfills
-require('cross-fetch/polyfill');
-
-
 // Polyfill XMLHttpRequest and WS for Firebase
 /* tslint:disable:no-string-literal */
 global['XMLHttpRequest'] = require('xhr2');
 global['WebSocket'] = require('ws');
 /* tslint:enable:no-string-literal */
 
+import '@angular/fire/firestore-protos';
+
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {
   const server = express();