Merge pull request #26 from gregoranders/development

Initial service worker

README.md

@@ -14,6 +14,7 @@
 * TypeScript
 * React + React-Router + Recoil
 * SCSS
+* ServiceWorker with PWA
 * Jest Snapshot/Unit Tests with Code Coverage (enzyme)
 * Jest + Puppeteer (screenshots from submodule) E2E Tests
 * Storybook (publish via CI into submodule)

SECURITY.md

@@ -4,6 +4,7 @@
 ​
 | Version | Supported          |
 | ------- | ------------------ |
+| 0.0.7   | :white_check_mark: |
 | 0.0.6   | :white_check_mark: |
 | 0.0.5   | :white_check_mark: |
 | 0.0.4   | :white_check_mark: |

docs/Intro.stories.mdx

@@ -2,7 +2,7 @@ import { Meta } from '@storybook/addon-docs/blocks';
 
 <Meta title="Docs|Intro" />
 
-# ts-react-playground - [TypeScript](http://www.typescriptlang.org/) [React](https://reactjs.org/) Playground v0.0.6
+# ts-react-playground - [TypeScript](http://www.typescriptlang.org/) [React](https://reactjs.org/) Playground v0.0.7
 
 [![Dependency Status][daviddm-image]][daviddm-url]
 [![License][license-image]][license-url]
@@ -16,6 +16,7 @@ import { Meta } from '@storybook/addon-docs/blocks';
 * TypeScript
 * React + React-Router + Recoil
 * SCSS
+* ServiceWorker with PWA
 * Jest Snapshot/Unit Tests with Code Coverage (enzyme)
 * Jest + Puppeteer (screenshots from submodule) E2E Tests
 * Storybook (publish via CI into submodule)

package.json

@@ -1,11 +1,11 @@
 {
   "name": "ts-react-playground",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "TypeScript React Playground",
   "scripts": {
     "start": "webpack-dev-server --open --progress --config webpack.config.js",
     "clear": "npm run prebuild && rimraf ./node_modules ./dist ./coverage ./coverage-e2e ./package-lock.json .jest-test-results.json junit.xml",
-    "prebuild": "npm run prebuild:webpack",
+    "prebuild": "npm run prebuild:webpack && npm run prebuild:esm",
     "build": "npm run build:webpack",
     "prebuild:esm": "npm run prevendor && npm run prescript && npm run preserviceWorker && npm run prescss && npm run prefavicon",
     "build:esm": "npm run vendor && npm run script && npm run scss && npm run favicon && npm run serviceWorker",

src/service/index.ts

@@ -23,23 +23,28 @@ namespace CustomServiceWorkerNS {
 
     private onInstall(event: ExtendableEvent) {
       event.waitUntil(
-        new Promise<void>((resolve) => {
-          resolve(this.cache.register(this.basename));
+        new Promise<void>(async (resolve) => {
+          await this.cache.register(this.basename);
+          resolve(this.service.skipWaiting());
         }),
       );
     }
 
     private onActivate(event: ExtendableEvent) {
       CustomServiceWorkerNS.log('onActivate');
-      event.waitUntil(this.service.clients.claim());
+      event.waitUntil(
+        new Promise<void>(async (resolve) => {
+          resolve(this.service.clients.claim());
+        }),
+      );
     }
 
     private onFetch(event: FetchEvent) {
       this.cache.fetch(event);
     }
   }
 
-  export const log = (...args: unknown[]) => {
+  export const log = (...args: unknown[]): void => {
     const styles = [`background-color: #008`];
     console.log(...[`%cServiceWorker ${CustomServiceWorkerNS.VERSION}`, styles.join(';')], args);
   };