@cocreate/pwa 1.2.6 → 1.3.0

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+# [1.3.0](https://github.com/CoCreate-app/CoCreate-pwa/compare/v1.2.7...v1.3.0) (2022-11-21)
+
+
+### Bug Fixes
+
+* commented console.logs ([38851a5](https://github.com/CoCreate-app/CoCreate-pwa/commit/38851a5fcae5b4d650811a3e9e04d01a702cdfd9))
+* ignore dist ([091e426](https://github.com/CoCreate-app/CoCreate-pwa/commit/091e426599af0a1637c9f4797e73c56cc46062ae))
+
+
+### Features
+
+* if cached return cache then request and store to get current version fto apply on next reload ([49ef323](https://github.com/CoCreate-app/CoCreate-pwa/commit/49ef323964187a136734179c94d002bbfabb30f8))
+
+## [1.2.7](https://github.com/CoCreate-app/CoCreate-pwa/compare/v1.2.6...v1.2.7) (2022-10-02)
+
+
+### Bug Fixes
+
+* minor bug fixes ([23713fe](https://github.com/CoCreate-app/CoCreate-pwa/commit/23713fe7b1726cc8685db16084ac4b253f78e387))
+
 ## [1.2.6](https://github.com/CoCreate-app/CoCreate-pwa/compare/v1.2.5...v1.2.6) (2022-10-02)
 
 

package/demo/sw.js

@@ -4,7 +4,8 @@ const CACHE_INMUTABLE_NAME = "inmutable-v1";
 const CACHE_TEMP = 'temp-cache';
 const CACHE_DYNAMIC_LIMIT = 50;
 const fetchedMap = []
-
+const cacheType = 'cache'
+const requestMap = new Map()
 
 function deleteCache(key) {
     return caches.delete(key);
@@ -31,7 +32,7 @@ self.addEventListener("activate", async (e) => {
 
     // e.waitUntil(updateCache())
         // updateCache() 
-
+        e.waitUntil(clients.claim());
 });
 
 self.addEventListener("fetch", (e) => {
@@ -40,23 +41,35 @@ self.addEventListener("fetch", (e) => {
         caches
         .match(e.request)
         .then((cachesObj) => {
-            if (!navigator.onLine && !!cachesObj) {
+            if (!navigator.onLine && !!cachesObj)
                 return cachesObj;
-            }
-            return fetch(e.request)
-                .then((newResp) => {
-                    caches
-                        .open(CACHE_DYNAMIC_NAME)
-                        .then((cache) => {
+            
+            if (cacheType == 'cache' && !!cachesObj) {
+                // console.log('returned from cache')
+                requestMap.set(cachesObj, '')
+                fetch(e.request).then((newResp) => {
+                    caches.open(CACHE_DYNAMIC_NAME).then((cache) => {
                             cache.put(e.request, newResp);
                             // cleanCache(CACHE_DYNAMIC_NAME, CACHE_DYNAMIC_LIMIT);
-                        })
-                        .catch(() => {});
-                    return newResp.clone();
-                })
-                .catch(() => {
+                    }).catch(() => {
+
+                    });
+                }).catch(() => {
                     return caches.match('./offline.html');
                 })
+                return cachesObj;
+            } else {
+                return fetch(e.request).then((newResp) => {
+                        caches.open(CACHE_DYNAMIC_NAME).then((cache) => {
+                            cache.put(e.request, newResp);
+                            // cleanCache(CACHE_DYNAMIC_NAME, CACHE_DYNAMIC_LIMIT);
+                        }).catch(() => {});
+                        return newResp.clone();
+                    })
+                    .catch(() => {
+                        return caches.match('./offline.html');
+                    })
+                }
         })
         .catch(function() {
             console.log('Fetch failed retuned offline page! ')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/pwa",
-  "version": "1.2.6",
+  "version": "1.3.0",
   "description": "A simple pwa component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "pwa",
@@ -60,6 +60,6 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/docs": "^1.3.16"
+    "@cocreate/docs": "^1.3.17"
   }
 }

package/src/index.js

@@ -16,7 +16,7 @@ const button = document.querySelector('[actions*="install"]');
 // }
 
 window.addEventListener('beforeinstallprompt', (event) => {
-    console.log('👍', 'beforeinstallprompt', event);
+    // console.log('👍', 'beforeinstallprompt', event);
     // Stash the event so it can be triggered later.
     window.deferredPrompt = event;
     // Remove the 'hidden' class from the install button container
@@ -26,7 +26,7 @@ window.addEventListener('beforeinstallprompt', (event) => {
 
 if (button) {
     button.addEventListener('click', async() => {
-        console.log('👍', 'installBtn-clicked');
+        // console.log('👍', 'installBtn-clicked');
         const promptEvent = window.deferredPrompt;
         if (!promptEvent) {
             // The deferred prompt isn't available.
@@ -46,7 +46,7 @@ if (button) {
 }
 
 window.addEventListener('appinstalled', (event) => {
-    console.log('👍', 'appinstalled', event);
+    // console.log('👍', 'appinstalled', event);
     // Clear the deferredPrompt so it can be garbage collected
     window.deferredPrompt = null;
 });
@@ -54,7 +54,7 @@ window.addEventListener('appinstalled', (event) => {
 async function persistData() {
     if (navigator.storage && navigator.storage.persist) {
       const result = await navigator.storage.persist();
-      console.log(`Data persisted: ${result}`);
+    //   console.log(`Data persisted: ${result}`);
     }
 }
 
@@ -81,7 +81,7 @@ if ('serviceWorker' in navigator) {
                                 reg.onupdatefound = () => {
                                     const installingWorker = reg.installing;
                                     installingWorker.onstatechange = () => {
-                                        console.log('Service Worker', installingWorker.state);
+                                        // console.log('Service Worker', installingWorker.state);
                                     }
                                 }
                             })