Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 1608676

Browse files
fix: Fixing perf and fcm (#2597)
1 parent ebf537e commit 1608676

File tree

16 files changed

+1185
-1870
lines changed

16 files changed

+1185
-1870
lines changed

‎sample/angular.json

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"src/favicon.ico",
2424
"src/assets",
2525
"src/manifest.webmanifest",
26+
"src/main-sw.js",
2627
"src/firebase-messaging-sw.js"
2728
],
2829
"styles": [
@@ -120,20 +121,34 @@
120121
"bundleDependencies": true,
121122
"externalDependencies": [
122123
"firebase",
123-
"@firebase/app",
124124
"@firebase/analytics",
125+
"@firebase/analytics-types",
125126
"@firebase/app",
127+
"@firebase/app-types",
126128
"@firebase/auth",
129+
"@firebase/auth-interop-types",
130+
"@firebase/auth-types",
127131
"@firebase/component",
128132
"@firebase/database",
133+
"@firebase/database-types",
129134
"@firebase/firestore",
135+
"@firebase/firestore-types",
130136
"@firebase/functions",
137+
"@firebase/functions-types",
131138
"@firebase/installations",
139+
"@firebase/installations-types",
140+
"@firebase/logger",
132141
"@firebase/messaging",
133-
"@firebase/storage",
142+
"@firebase/messaging-types",
134143
"@firebase/performance",
144+
"@firebase/performance-types",
145+
"@firebase/polyfill",
135146
"@firebase/remote-config",
136-
"@firebase/util"
147+
"@firebase/remote-config-types",
148+
"@firebase/storage",
149+
"@firebase/storage-types",
150+
"@firebase/util",
151+
"@firebase/webchannel-wrapper"
137152
]
138153
},
139154
"configurations": {

‎sample/ngcc.config.js

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

‎sample/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@angular/router": "~10.1.3",
2727
"@angular/service-worker": "^10.1.3",
2828
"@nguniversal/express-engine": "~10.1.0",
29-
"firebase": "~7.13.2",
29+
"firebase": "^7.21.1",
3030
"first-input-delay": "^0.1.3",
3131
"proxy-polyfill": "^0.3.2",
3232
"rxjs": "~6.6.3",

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import { Component, OnInit } from '@angular/core';
22
import { AngularFireMessaging } from '@angular/fire/messaging';
33
import { trace } from '@angular/fire/performance';
4-
import { Observable, fromEvent } from 'rxjs';
5-
import { tap, map, filter } from 'rxjs/operators';
6-
import * as firebase from 'firebase/app';
7-
import 'firebase/messaging';
4+
import { Observable } from 'rxjs';
5+
import { tap } from 'rxjs/operators';
86
import { SwPush } from '@angular/service-worker';
7+
import { environment } from '../../environments/environment';
98

109
@Component({
1110
selector: 'app-messaging',
@@ -25,8 +24,15 @@ export class MessagingComponent implements OnInit {
2524
message$: Observable<any>;
2625
showRequest = false;
2726

28-
constructor(public readonly messaging: AngularFireMessaging, swPush: SwPush) {
29-
messaging.usePublicVapidKey('BIDPctnXHQDIjcOXxDS6qQcz-QTws7bL8v7UPgFnS1Ky5BZL3jS3-XXfxwRHmAUMOk7pXme7ttOBvVoIfX57PEo').then(() => {
27+
constructor(public readonly messaging: AngularFireMessaging, readonly swpush: SwPush) {
28+
swpush.messages.subscribe(it => console.log('swpush', it));
29+
messaging.usePublicVapidKey(environment.vapidKey).then(async () => {
30+
if (navigator && navigator.serviceWorker) {
31+
const registration = await navigator.serviceWorker.getRegistration();
32+
if (registration) {
33+
await messaging.useServiceWorker(registration);
34+
}
35+
}
3036
this.message$ = messaging.messages;
3137
this.token$ = messaging.tokenChanges.pipe(
3238
trace('token'),

‎sample/src/environments/environment.prod.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ export const environment = {
99
messagingSenderId: '480362569154',
1010
appId: '1:480362569154:web:2fe6f75104cdfb82f50a5b',
1111
measurementId: 'G-CBRYER9PJR'
12-
}
12+
},
13+
vapidKey: 'BIDPctnXHQDIjcOXxDS6qQcz-QTws7bL8v7UPgFnS1Ky5BZL3jS3-XXfxwRHmAUMOk7pXme7ttOBvVoIfX57PEo'
1314
};

‎sample/src/environments/environment.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ export const environment = {
1313
messagingSenderId: '480362569154',
1414
appId: '1:480362569154:web:2fe6f75104cdfb82f50a5b',
1515
measurementId: 'G-CBRYER9PJR'
16-
}
16+
},
17+
vapidKey: 'BIDPctnXHQDIjcOXxDS6qQcz-QTws7bL8v7UPgFnS1Ky5BZL3jS3-XXfxwRHmAUMOk7pXme7ttOBvVoIfX57PEo'
1718
};
1819

1920
/*

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
importScripts('https://www.gstatic.com/firebasejs/7.13.2/firebase-app.js');
2-
importScripts('https://www.gstatic.com/firebasejs/7.13.2/firebase-messaging.js');
1+
importScripts('https://www.gstatic.com/firebasejs/7.21.1/firebase-app.js');
2+
importScripts('https://www.gstatic.com/firebasejs/7.21.1/firebase-messaging.js');
33

44
firebase.initializeApp({
55
apiKey: 'AIzaSyA7CNE9aHbcSEbt9y03QReJ-Xr0nwKg7Yg',

‎sample/src/main-sw.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
importScripts('/ngsw-worker.js');
2+
importScripts('/firebase-messaging-sw.js');

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /