Merge pull request #73 from oslabs-beta/staging

Staging

Author: crperezt

.eslintrc

@@ -1,7 +1,11 @@
 {
-  "extends": ["airbnb", "plugin:jest/recommended"],
+  "extends": [
+    "airbnb", 
+    "plugin:jest/recommended",
+    "plugin:@typescript-eslint/eslint-recommended",
+    "plugin:@typescript-eslint/recommended"],
   "root": true,
-  "plugins": ["jest", "react", "react-hooks"],
+  "plugins": ["jest", "react", "react-hooks", "@typescript-eslint"],
   "rules": {
     "arrow-parens": [2, "as-needed"],
     "import/no-unresolved": "off",

package-lock.json

@@ -63,6 +63,8 @@
     "@types/chrome": "^0.0.119",
     "@types/jest": "^26.0.4",
     "@types/node": "^12.12.50",
+    "@typescript-eslint/eslint-plugin": "^3.6.1",
+    "@typescript-eslint/parser": "^3.6.1",
     "babel-loader": "^8.1.0",
     "core-js": "^3.6.5",
     "css-loader": "^3.6.0",

package.json

@@ -6,32 +6,9 @@ import 'core-js';
 import 'regenerator-runtime/runtime';
 import linkFiberStart from './linkFiber';
 import timeJumpStart from './timeJump';
+import { Snapshot, Mode, SnapshotNode, MsgData } from './types/backendTypes'
 import { Interface } from 'readline';
 
-interface Snapshot{
-    tree: null;
-    unfilteredTree: null;
-}
-
-interface Mode {
-    jumping: boolean;
-    paused: boolean;
-    locked: boolean;
-}
-interface Node{
-    name: string;
-    state: {
-      location?: any
-    }
-    children: any[]
-}
-interface Data{
-  data: {
-    action: string,
-    payload: any,
-  }
-}
-
 // * State snapshot object initialized here
 const snapShot: Snapshot = { 
   tree: null,
@@ -44,19 +21,10 @@ const mode: Mode = {
   locked: false,
 };
 
-
-// const linkFiber = require('./linkFiber')(snapShot, mode);
-// const timeJump = require('./timeJump')(snapShot, mode);
-
-
-
 const linkFiber = linkFiberStart(snapShot, mode);
-console.log('linkfiber --> ',linkFiber)
 const timeJump = timeJumpStart(snapShot, mode);
-console.log('timejump --> ' , timeJump )
-
 
-function getRouteURL(node: Node): string {
+function getRouteURL(node: SnapshotNode): string {
   if (node.name === 'Router') {
     return node.state.location.pathname;
   }
@@ -69,15 +37,15 @@ function getRouteURL(node: Node): string {
 }
 
 // * Event listener for time-travel actions
-window.addEventListener('message', ({ data: { action, payload } } : Data) => {
+window.addEventListener('message', ({ data: { action, payload } } : MsgData) => {
   switch (action) {
     case 'jumpToSnap':
       timeJump(payload); // * This sets state with given payload
       // Get the pathname from payload and add new entry to browser history
       // MORE: https://developer.mozilla.org/en-US/docs/Web/API/History/pushState
 
       // try to modify workInProgress tree from here
-      window.history.pushState('', '', getRouteURL(payload));
+      // window.history.pushState('', '', getRouteURL(payload));
       break;
     case 'setLock':
       mode.locked = payload;
@@ -91,6 +59,3 @@ window.addEventListener('message', ({ data: { action, payload } } : Data) => {
 });
 
 linkFiber();
-
-// module.exports = linkFiber;
-// export default linkFiber;