Skip to content

Commit 15ca4fb

Browse files
committed
Merge branch 'master' into staging
2 parents e839e90 + 0bf9ec4 commit 15ca4fb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+4670
-3703
lines changed

dev-reactime/astParser.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'core-js';
12
/* eslint-disable no-inner-declarations, no-loop-func */
23
// eslint-disable-next-line import/newline-after-import
34
const acorn = require('acorn'); // javascript parser

dev-reactime/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
* @function linkFiber
44
*/
55
import 'core-js';
6-
import 'regenerator-runtime/runtime';
6+
// import 'regenerator-runtime/runtime';
77
import linkFiberStart from './linkFiber';
88
import timeJumpStart from './timeJump';
99

1010
// * State snapshot object initialized here
1111
const snapShot = {
1212
tree: null,
13-
unfilteredTree: null
13+
unfilteredTree: null,
1414
};
1515

1616
const mode = {

dev-reactime/linkFiber.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'core-js';
12
/* eslint-disable indent */
23
/* eslint-disable brace-style */
34
/* eslint-disable comma-dangle */

dev-reactime/masterState.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'core-js';
12
/* eslint-disable no-plusplus */
23
/* eslint-disable guard-for-in */
34
/* eslint-disable no-restricted-syntax */

dev-reactime/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"license": "MIT",
5151
"dependencies": {
5252
"acorn": "^7.1.0",
53+
"core-js": "^3.6.5",
5354
"acorn-jsx": "^5.0.2",
5455
"fs": "0.0.1-security"
5556
}

dev-reactime/reactWorkTags.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'core-js';
12
// eslint-disable-next-line import/prefer-default-export
23
export const reactWorkTags = [
34
{ 0: 'FunctionComponent' },

dev-reactime/timeJump.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'core-js';
12
/**
23
* This file contains necessary functionality for time-travel feature
34
*

dev-reactime/tree.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'core-js';
12
/* eslint-disable no-multiple-empty-lines */
23
/* eslint-disable max-classes-per-file */
34
/* eslint-disable no-console */

package-lock.json

Lines changed: 4366 additions & 3461 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 45 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
{
22
"name": "reactime",
33
"description": "build web extension bundle.js",
4+
"jest": {
5+
"transform": {
6+
".(ts|tsx)": "ts-jest"
7+
},
8+
"testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
9+
"moduleFileExtensions": [
10+
"ts",
11+
"tsx",
12+
"js"
13+
]
14+
},
415
"scripts": {
516
"build": "webpack --mode production",
617
"dev": "webpack --mode development --watch",
@@ -44,51 +55,57 @@
4455
],
4556
"license": "ISC",
4657
"devDependencies": {
47-
"@babel/core": "^7.10.3",
48-
"@babel/plugin-proposal-class-properties": "^7.5.5",
49-
"@babel/plugin-proposal-decorators": "^7.4.4",
50-
"@babel/preset-env": "^7.10.3",
51-
"@babel/preset-react": "^7.0.0",
52-
"babel-loader": "^8.0.6",
58+
"@babel/core": "^7.10.4",
59+
"@babel/plugin-proposal-class-properties": "^7.10.4",
60+
"@babel/plugin-proposal-decorators": "^7.10.4",
61+
"@babel/preset-env": "^7.10.4",
62+
"@babel/preset-react": "^7.10.4",
63+
"@types/chrome": "^0.0.119",
64+
"@types/jest": "^26.0.4",
65+
"@types/node": "^12.7.8",
66+
"babel-loader": "^8.1.0",
5367
"core-js": "^3.6.5",
54-
"css-loader": "^3.2.0",
55-
"enzyme": "^3.10.0",
56-
"enzyme-adapter-react-16": "^1.14.0",
57-
"eslint": "^6.5.1",
58-
"eslint-config-airbnb": "^18.0.1",
59-
"eslint-plugin-import": "^2.18.2",
60-
"eslint-plugin-jest": "^22.15.0",
61-
"eslint-plugin-jsx-a11y": "^6.2.3",
62-
"eslint-plugin-react": "^7.15.1",
68+
"css-loader": "^3.6.0",
69+
"enzyme": "^3.11.0",
70+
"enzyme-adapter-react-16": "^1.15.2",
71+
"eslint": "^6.8.0",
72+
"eslint-config-airbnb": "^18.2.0",
73+
"eslint-plugin-import": "^2.22.0",
74+
"eslint-plugin-jest": "^22.21.0",
75+
"eslint-plugin-jsx-a11y": "^6.3.1",
76+
"eslint-plugin-react": "^7.20.3",
6377
"eslint-plugin-react-hooks": "^1.7.0",
6478
"jest": "^24.9.0",
65-
"jest-cli": "^24.8.0",
66-
"jest-runner-eslint": "^0.7.4",
67-
"node-sass": "^4.12.0",
68-
"sass": "^1.22.9",
69-
"sass-loader": "^7.2.0",
79+
"jest-cli": "^24.9.0",
80+
"jest-runner-eslint": "^0.7.7",
81+
"node-sass": "^4.14.1",
82+
"sass": "^1.26.10",
83+
"sass-loader": "^7.3.1",
7084
"sinon-chrome": "^3.0.1",
7185
"style-loader": "^0.23.1",
86+
"ts-jest": "^26.1.1",
87+
"ts-loader": "^7.0.5",
88+
"typescript": "^3.9.6",
7289
"webpack": "^4.43.0",
7390
"webpack-chrome-extension-reloader": "^1.3.0",
74-
"webpack-cli": "^3.3.6"
91+
"webpack-cli": "^3.3.12"
7592
},
7693
"dependencies": {
7794
"bower": "^1.8.8",
7895
"d3": "^5.16.0",
7996
"d3-zoom": "^1.8.3",
80-
"flatted": "^3.0.2",
81-
"immer": "^3.2.0",
97+
"flatted": "^3.0.4",
98+
"immer": "^3.3.0",
8299
"jest-runner": "^24.9.0",
83100
"jsondiffpatch": "^0.3.11",
84101
"prop-types": "^15.7.2",
85-
"rc-slider": "^8.6.13",
102+
"rc-slider": "^8.7.1",
86103
"rc-tooltip": "^3.7.3",
87-
"react": "^16.9.0",
88-
"react-dom": "^16.9.0",
104+
"react": "^16.13.1",
105+
"react-dom": "^16.13.1",
89106
"react-html-parser": "^2.0.2",
90107
"react-json-tree": "^0.11.2",
91-
"react-router-dom": "^5.0.1",
92-
"react-select": "^3.0.4"
108+
"react-router-dom": "^5.2.0",
109+
"react-select": "^3.1.0"
93110
}
94111
}

0 commit comments

Comments
 (0)