merge conflicts

Author: crperezt

dev-reactime/astParser.js

@@ -1,3 +1,4 @@
+import 'core-js';
 /* eslint-disable no-inner-declarations, no-loop-func */
 // eslint-disable-next-line import/newline-after-import
 const acorn = require('acorn'); // javascript parser

dev-reactime/index.js

@@ -3,14 +3,14 @@
  * @function linkFiber
  */
 import 'core-js';
-import 'regenerator-runtime/runtime';
+// import 'regenerator-runtime/runtime';
 import linkFiberStart from './linkFiber';
 import timeJumpStart from './timeJump';
 
 // * State snapshot object initialized here
 const snapShot = { 
   tree: null,
-  unfilteredTree: null
+  unfilteredTree: null,
 };
 
 const mode = {

dev-reactime/linkFiber.js

@@ -1,3 +1,4 @@
+import 'core-js';
 /* eslint-disable indent */
 /* eslint-disable brace-style */
 /* eslint-disable comma-dangle */

dev-reactime/masterState.js

@@ -1,3 +1,4 @@
+import 'core-js';
 /* eslint-disable no-plusplus */
 /* eslint-disable guard-for-in */
 /* eslint-disable no-restricted-syntax */

dev-reactime/package.json

@@ -0,0 +1,57 @@
+{
+  "name": "dev-reactime",
+  "version": "4.0.0",
+  "description": "A library that helps debug React by memorizing the state of components with every render.",
+  "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/open-source-labs/reactime"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\""
+  },
+  "types": "./index.d.ts",
+  "peerDependencies": {
+    "react": "~16.0.0",
+    "react-dom": "~16.0.0"
+  },
+  "keywords": [
+    "react",
+    "state",
+    "useState",
+    "setState",
+    "debug",
+    "reactime",
+    "react devtool"
+  ],
+  "contributors": [
+    "Abaas Khorrami",
+    "Andy Wong",
+    "Bryan Lee",
+    "Carlos Perez",
+    "Chris Flannery",
+    "David Chai",
+    "Edwin Menendez",
+    "Ergi Shehu",
+    "Gabriela Jardim Aquino",
+    "Gregory Panciera",
+    "Josh Kim",
+    "Joshua Howard",
+    "Nathanael Wa Mwenze",
+    "Prasanna Malla",
+    "Rajeeb Banstola",
+    "Raymond Kwan",
+    "Rocky Lin",
+    "Ruth Anam",
+    "Ryan Dang",
+    "Sierra Swaby",
+    "Yujin Kang"
+  ],
+  "license": "MIT",
+  "dependencies": {
+    "acorn": "^7.1.0",
+    "core-js": "^3.6.5",
+    "acorn-jsx": "^5.0.2",
+    "fs": "0.0.1-security"
+  }
+}

dev-reactime/reactWorkTags.js

@@ -1,3 +1,4 @@
+import 'core-js';
 // eslint-disable-next-line import/prefer-default-export
 export const reactWorkTags = [
   { 0: 'FunctionComponent' },

dev-reactime/timeJump.js

@@ -1,3 +1,4 @@
+import 'core-js';
 /**
  * This file contains necessary functionality for time-travel feature
  *

dev-reactime/tree.js

@@ -1,3 +1,4 @@
+import 'core-js';
 /* eslint-disable no-multiple-empty-lines */
 /* eslint-disable max-classes-per-file */
 /* eslint-disable no-console */