Merge pull request #8 from stagfoo/feature/tidy

Feature/tidy
stagfoo · Jul 28, 2020 · a971b64 · a971b64 · vercel · Jul 28, 2020
2 parents 1856b7e + c75f662
commit a971b64
Show file tree

Hide file tree

Showing 8 changed files with 9,671 additions and 27 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -389,24 +389,5 @@
 
   <body>
     <div id="app"></div>
-    <script>
-      if ("serviceWorker" in navigator) {
-        window.addEventListener("load", () => {
-          navigator.serviceWorker.register("./service-worker.js", {
-            scope: "."
-          }).then(
-            (registration) => {
-              console.log(
-                `ServiceWorker registration successful with scope: ${registration.scope}`
-              );
-              registration.pushManager.subscribe({userVisibleOnly: true});
-            },
-            (error) => {
-              console.log(`ServiceWorker registration failed: ${error}`);
-            }
-          );
-        });
-      }
-    </script>
   </body>
 </html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,6 +15,7 @@
     "joro": "^1.0.4",
     "morphdom": "^2.5.12",
     "nanohtml": "^1.9.0",
+    "nanomorph": "^5.4.2",
     "obake.js": "^1.0.1",
     "page": "^1.11.4"
   },

diff --git a/src/actions.ts b/src/actions.ts
@@ -1,5 +1,5 @@
 import { state } from './index';
 
 export function handleGreetingClick() {
-  state._update('changeGreeting', state.greeting + '🍖')
+  state._update('updateGreeting', state.greeting + '🍖')
 };
diff --git a/src/index.ts b/src/index.ts
@@ -4,7 +4,7 @@ import { hydrateState, dehydrateState} from 'utils'
 import { createStore } from 'obake.js';
 import { AppRoot } from './ui';
 import { BaseStyles  } from './styles';
-import morphdom from 'morphdom';
+import morph from 'nanomorph';
 
 //Default render
 const ROOT_NODE = document.body.querySelector('#app');
@@ -19,10 +19,13 @@ export const state = createStore(
     },
     reducers
   );
+
 //Render Loop function
 function renderer(newState) {
-   morphdom(ROOT_NODE, AppRoot(newState), {
+  morph(ROOT_NODE, AppRoot(newState), {
     onBeforeElUpdated: function(fromEl, toEl) {
+        // spec - https://dom.spec.whatwg.org/#concept-node-equals
+
         if (fromEl.isEqualNode(toEl)) {
             return false
         }
@@ -31,7 +34,6 @@ function renderer(newState) {
   })
 }
 //Start Router listener
-//too fast for fonts
 startRouters();
 BaseStyles();
 

diff --git a/src/store.ts b/src/store.ts
@@ -22,7 +22,7 @@ export const reducers = {
   updateCurrentPage: reducer((state, value: string) => {
     state.currentPage = { name: value, activePage:activePage[value]  };
   }),
-  changeGreeting: reducer((state, value: string) => {
+  updateGreeting: reducer((state, value: string) => {
     state.greeting = value;
   }),
   updateNotification: reducer((state, value:{text: string, show: boolean}) => {

diff --git a/src/url.ts b/src/url.ts
@@ -18,7 +18,7 @@ const HOME_PAGE = (ctx: Context, next: any) => {
 };
 const EXAMPLE_FETCH = (ctx: Context, next: any) => {
   getData('chum').then(data => {
-    state._update('changeGreeting', data.greeting)
+    state._update('updateGreeting', data.greeting)
     state._update('updateCurrentPage', 'EXAMPLE_FETCH')
     state._update('updateNotification', {
       text: "Shark data loaded  (´ε｀ )♡",

diff --git a/webpack.config.js b/webpack.config.js
@@ -51,10 +51,8 @@ module.exports = {
       cacheId: `${new Date().getTime()}`,
       cleanupOutdatedCaches: true,
       inlineWorkboxRuntime: true,
-      navigateFallback: "index.html",
       include:[
         "main.bundle.js",
-        "index.html",
         "data.json",
       ],
       clientsClaim: true,