From 388496c17d99839d1c87e3645fd7123014fffbf8 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Mon, 7 Jun 2021 21:05:03 +0200 Subject: [PATCH] refactor(service-worker): ensure compatibility with noImplicitOverride (#42512) Adds the `override` keyword to the `service-worker` sources to ensure compatibility with `noImplicitOverride`. PR Close #42512 --- packages/service-worker/worker/testing/fetch.ts | 1 - packages/service-worker/worker/testing/scope.ts | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/service-worker/worker/testing/fetch.ts b/packages/service-worker/worker/testing/fetch.ts index 43ed7e33d8..06a2d8c1cf 100644 --- a/packages/service-worker/worker/testing/fetch.ts +++ b/packages/service-worker/worker/testing/fetch.ts @@ -99,7 +99,6 @@ export class MockHeaders implements Headers { export class MockRequest extends MockBody implements Request { readonly isHistoryNavigation: boolean = false; readonly isReloadNavigation: boolean = false; - readonly body!: ReadableStream; readonly cache: RequestCache = 'default'; readonly credentials: RequestCredentials = 'omit'; readonly destination: RequestDestination = 'document'; diff --git a/packages/service-worker/worker/testing/scope.ts b/packages/service-worker/worker/testing/scope.ts index f635e69034..16328c5343 100644 --- a/packages/service-worker/worker/testing/scope.ts +++ b/packages/service-worker/worker/testing/scope.ts @@ -71,7 +71,7 @@ export class SwTestHarnessImpl extends Adapter implements }, } as any; - get time() { + override get time() { return this.mockTime; } @@ -84,7 +84,7 @@ export class SwTestHarnessImpl extends Adapter implements fired: boolean, }[] = []; - parseUrl = parseUrl; + override parseUrl = parseUrl; constructor(private server: MockServerState, caches: MockCacheStorage, scopeUrl: string) { super(scopeUrl, caches); @@ -156,15 +156,15 @@ export class SwTestHarnessImpl extends Adapter implements this.eventHandlers.delete(type); } - newRequest(url: string, init: Object = {}): Request { + override newRequest(url: string, init: Object = {}): Request { return new MockRequest(normalizeUrl(url, this.scopeUrl), init); } - newResponse(body: string, init: Object = {}): Response { + override newResponse(body: string, init: Object = {}): Response { return new MockResponse(body, init); } - newHeaders(headers: {[name: string]: string}): Headers { + override newHeaders(headers: {[name: string]: string}): Headers { return Object.keys(headers).reduce((mock, name) => { mock.set(name, headers[name]); return mock; @@ -227,7 +227,7 @@ export class SwTestHarnessImpl extends Adapter implements return event.ready; } - timeout(ms: number): Promise { + override timeout(ms: number): Promise { const promise = new Promise(resolve => { this.timers.push({ at: this.mockTime + ms, @@ -254,7 +254,7 @@ export class SwTestHarnessImpl extends Adapter implements }); } - isClient(obj: any): obj is Client { + override isClient(obj: any): obj is Client { return obj instanceof MockClient; } }