From 250afc829b4c0140af6e329c6b42470667ab9e33 Mon Sep 17 00:00:00 2001 From: Gregor Anders Date: Fri, 12 Jun 2020 04:37:38 +0200 Subject: [PATCH 1/4] 0.0.7 Release --- README.md | 1 + docs/Intro.stories.mdx | 3 ++- package.json | 2 +- src/service/index.ts | 13 +++++++++---- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b3f9c90..2d1fd93 100644 --- a/README.md +++ b/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) diff --git a/docs/Intro.stories.mdx b/docs/Intro.stories.mdx index 663272d..1369b91 100644 --- a/docs/Intro.stories.mdx +++ b/docs/Intro.stories.mdx @@ -2,7 +2,7 @@ import { Meta } from '@storybook/addon-docs/blocks'; -# 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) diff --git a/package.json b/package.json index d5b124d..1fa1d54 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "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", diff --git a/src/service/index.ts b/src/service/index.ts index fee2866..cc69131 100644 --- a/src/service/index.ts +++ b/src/service/index.ts @@ -23,15 +23,20 @@ namespace CustomServiceWorkerNS { private onInstall(event: ExtendableEvent) { event.waitUntil( - new Promise((resolve) => { - resolve(this.cache.register(this.basename)); + new Promise(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(async (resolve) => { + resolve(this.service.clients.claim()); + }), + ); } private onFetch(event: FetchEvent) { @@ -39,7 +44,7 @@ namespace CustomServiceWorkerNS { } } - export const log = (...args: unknown[]) => { + export const log = (...args: unknown[]): void => { const styles = [`background-color: #008`]; console.log(...[`%cServiceWorker ${CustomServiceWorkerNS.VERSION}`, styles.join(';')], args); }; From 7b93b8504447b19ae8085336b0d4d58e967e0a9a Mon Sep 17 00:00:00 2001 From: Gregor Anders Date: Fri, 12 Jun 2020 04:39:15 +0200 Subject: [PATCH 2/4] 0.0.7 screenshots --- e2e/screenshots | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/screenshots b/e2e/screenshots index 5207e88..c4d6cef 160000 --- a/e2e/screenshots +++ b/e2e/screenshots @@ -1 +1 @@ -Subproject commit 5207e8838f64b6d51611dcdc8320e339d5032fbd +Subproject commit c4d6cef6cc6b367f7c0114c4e5bca305ea4c4b23 From 7e74a1f6b6ccc51783e860074d262ff0ef858cbe Mon Sep 17 00:00:00 2001 From: Gregor Anders Date: Fri, 12 Jun 2020 04:41:46 +0200 Subject: [PATCH 3/4] Add release --- SECURITY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/SECURITY.md b/SECURITY.md index 70941f6..048b890 100644 --- a/SECURITY.md +++ b/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: | From 99b9aa7ef998d6da59c33e52f6c01f64826f5838 Mon Sep 17 00:00:00 2001 From: Gregor Anders Date: Fri, 12 Jun 2020 04:47:11 +0200 Subject: [PATCH 4/4] Remove esm build on clear --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1fa1d54..bfdbca2 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "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",