installations and messaging

Author: hsubox76

packages/installations-compat/package.json

@@ -52,7 +52,7 @@
     "@rollup/plugin-node-resolve": "13.3.0",
     "rollup-plugin-typescript2": "0.31.2",
     "rollup-plugin-uglify": "6.0.4",
-    "typescript": "4.2.2"
+    "typescript": "4.7.4"
   },
   "peerDependencies": {
     "@firebase/app-compat": "0.x"

packages/installations-types/package.json

@@ -23,6 +23,6 @@
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
   "devDependencies": {
-    "typescript": "4.2.2"
+    "typescript": "4.7.4"
   }
 }

packages/installations/package.json

@@ -57,7 +57,7 @@
     "@rollup/plugin-node-resolve": "13.3.0",
     "rollup-plugin-typescript2": "0.31.2",
     "rollup-plugin-uglify": "6.0.4",
-    "typescript": "4.2.2"
+    "typescript": "4.7.4"
   },
   "peerDependencies": {
     "@firebase/app": "0.x"

packages/installations/src/functions/create-installation-request.test.ts

@@ -39,7 +39,7 @@ const FID = 'defenders-of-the-faith';
 
 describe('createInstallationRequest', () => {
   let fakeInstallations: FirebaseInstallationsImpl;
-  let fetchSpy: SinonStub<[RequestInfo, RequestInit?], Promise<Response>>;
+  let fetchSpy: SinonStub<[RequestInfo | URL, RequestInit?], Promise<Response>>;
   let inProgressInstallationEntry: InProgressInstallationEntry;
   let response: CreateInstallationResponse;
 

packages/installations/src/functions/delete-installation-request.test.ts

@@ -37,7 +37,7 @@ const FID = 'foreclosure-of-a-dream';
 
 describe('deleteInstallationRequest', () => {
   let appConfig: AppConfig;
-  let fetchSpy: SinonStub<[RequestInfo, RequestInit?], Promise<Response>>;
+  let fetchSpy: SinonStub<[RequestInfo | URL, RequestInit?], Promise<Response>>;
   let registeredInstallationEntry: RegisteredInstallationEntry;
 
   beforeEach(() => {

packages/installations/src/functions/generate-auth-token-request.test.ts

@@ -40,7 +40,7 @@ const FID = 'evil-has-no-boundaries';
 
 describe('generateAuthTokenRequest', () => {
   let installations: FirebaseInstallationsImpl;
-  let fetchSpy: SinonStub<[RequestInfo, RequestInit?], Promise<Response>>;
+  let fetchSpy: SinonStub<[RequestInfo | URL, RequestInit?], Promise<Response>>;
   let registeredInstallationEntry: RegisteredInstallationEntry;
   let response: GenerateAuthTokenResponse;
 

packages/messaging-compat/package.json

@@ -49,7 +49,7 @@
     "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-typescript2": "0.31.2",
     "ts-essentials": "9.3.0",
-    "typescript": "4.2.2"
+    "typescript": "4.7.4"
   },
   "repository": {
     "directory": "packages/messaging",

packages/messaging-interop-types/package.json

@@ -20,6 +20,6 @@
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
   "devDependencies": {
-    "typescript": "4.2.2"
+    "typescript": "4.7.4"
   }
 }

packages/messaging/package.json

@@ -67,7 +67,7 @@
     "rollup-plugin-typescript2": "0.31.2",
     "@rollup/plugin-json": "4.1.0",
     "ts-essentials": "9.3.0",
-    "typescript": "4.2.2"
+    "typescript": "4.7.4"
   },
   "repository": {
     "directory": "packages/messaging",

packages/messaging/src/listeners/sw-listeners.test.ts

@@ -80,6 +80,13 @@ const DISPLAY_MESSAGE: MessagePayloadInternal = {
   fcmMessageId: 'mid'
 };
 
+// maxActions is an experimental property and not part of the official
+// TypeScript interface
+// https://developer.mozilla.org/en-US/docs/Web/API/Notification/maxActions
+interface NotificationExperimental extends Notification {
+  maxActions?: number;
+}
+
 describe('SwController', () => {
   let addEventListenerStub: Stub<typeof self.addEventListener>;
   // eslint-disable-next-line @typescript-eslint/ban-types
@@ -227,10 +234,10 @@ describe('SwController', () => {
     it('warns if there are more action buttons than the browser limit', async () => {
       // This doesn't exist on Firefox:
       // https://developer.mozilla.org/en-US/docs/Web/API/notification/maxActions
-      if (!Notification.maxActions) {
+      if (!(Notification as unknown as NotificationExperimental).maxActions) {
         return;
       }
-      stub(Notification, 'maxActions').value(1);
+      stub((Notification as unknown as NotificationExperimental), 'maxActions').value(1);
 
       const warnStub = stub(console, 'warn');
 

packages/messaging/src/listeners/sw-listeners.ts

@@ -40,6 +40,13 @@ import { isConsoleMessage } from '../helpers/is-console-message';
 import { sleep } from '../helpers/sleep';
 import { stageLog } from '../helpers/logToFirelog';
 
+// maxActions is an experimental property and not part of the official
+// TypeScript interface
+// https://developer.mozilla.org/en-US/docs/Web/API/Notification/maxActions
+interface NotificationExperimental extends Notification {
+  maxActions?: number;
+}
+
 // Let TS know that this is a service worker
 declare const self: ServiceWorkerGlobalScope;
 
@@ -247,7 +254,7 @@ function showNotification(
   // Note: Firefox does not support the maxActions property.
   // https://developer.mozilla.org/en-US/docs/Web/API/notification/maxActions
   const { actions } = notificationPayloadInternal;
-  const { maxActions } = Notification;
+  const { maxActions } = Notification as unknown as NotificationExperimental;
   if (actions && maxActions && actions.length > maxActions) {
     console.warn(
       `This browser only supports ${maxActions} actions. The remaining actions will not be displayed.`

packages/messaging/src/testing/fakes/service-worker.ts

@@ -80,7 +80,7 @@ class FakeWindowClient implements WindowClient {
   readonly id: string;
   readonly type = 'window';
   focused = false;
-  visibilityState: VisibilityState = 'hidden';
+  visibilityState: DocumentVisibilityState = 'hidden';
   url = 'https://example.org';
 
   constructor() {
@@ -112,7 +112,6 @@ export class FakeServiceWorkerRegistration
 
   // Unused in FCM Web SDK, no need to mock these.
   navigationPreload = null as unknown as NavigationPreloadManager;
-  sync = null as unknown as SyncManager;
   updateViaCache = null as unknown as ServiceWorkerUpdateViaCache;
 
   async getNotifications() {

packages/messaging/src/util/sw-types.ts

@@ -63,7 +63,7 @@ export interface ClientQueryOptions {
 
 export interface WindowClient extends Client {
   readonly focused: boolean;
-  readonly visibilityState: VisibilityState;
+  readonly visibilityState: DocumentVisibilityState;
   focus(): Promise<WindowClient>;
   navigate(url: string): Promise<WindowClient>;
 }