Skip to content

Commit bf6049d

Browse files
committed
Merge branch 'develop'
2 parents 8ddfe36 + c2c4182 commit bf6049d

File tree

8 files changed

+12647
-21184
lines changed

8 files changed

+12647
-21184
lines changed

.eslintrc.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"version": "detect"
1212
}
1313
},
14-
"parser": "babel-eslint",
14+
"parser": "@babel/eslint-parser",
1515
"parserOptions": {
1616
"ecmaVersion": 12,
1717
"sourceType": "module",
@@ -32,7 +32,6 @@
3232
"plugin:prettier/recommended"
3333
],
3434
"rules": {
35-
"prettier/prettier": "error",
3635
"require-jsdoc": [
3736
"error",
3837
{

.husky/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

__tests__/shim.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
global.requestAnimationFrame = (callback) => setTimeout(callback, 0);
1+
import { JSDOM } from 'jsdom';
22

3-
HTMLCanvasElement.prototype.getContext = () => ({
4-
clearRect: () => {},
5-
fillRect: () => {},
6-
});
3+
global.Image = new JSDOM('').window.Image;
4+
global.requestAnimationFrame = (callback) => setTimeout(callback, 0);

example/package-lock.json

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

example/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
},
3131
"devDependencies": {
3232
"@babel/core": "^7.11.6",
33+
"@babel/eslint-parser": "^7.15.4",
3334
"@babel/plugin-proposal-class-properties": "^7.10.4",
3435
"@babel/preset-env": "^7.11.5",
3536
"@babel/preset-react": "^7.10.4",
3637
"@babel/register": "^7.11.5",
37-
"babel-eslint": "^10.1.0",
3838
"babel-loader": "^8.1.0",
39-
"eslint": "^7.8.1",
39+
"eslint": "^7.32.0",
4040
"eslint-plugin-react": "^7.20.6",
4141
"webpack": "^5.3.2",
4242
"webpack-cli": "^4.1.0"

package-lock.json

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

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,37 +37,37 @@
3737
},
3838
"devDependencies": {
3939
"@babel/core": "^7.11.6",
40+
"@babel/eslint-parser": "^7.15.4",
4041
"@babel/plugin-external-helpers": "^7.10.4",
4142
"@babel/plugin-proposal-class-properties": "^7.10.4",
4243
"@babel/plugin-transform-runtime": "^7.11.5",
4344
"@babel/preset-env": "^7.11.5",
4445
"@babel/preset-react": "^7.10.4",
4546
"@rollup/plugin-babel": "^5.2.1",
46-
"@rollup/plugin-commonjs": "^17.0.0",
47-
"@rollup/plugin-node-resolve": "^11.0.1",
48-
"@wojtekmaj/enzyme-adapter-react-17": "^0.4.1",
49-
"babel-eslint": "^10.1.0",
50-
"babel-jest": "^26.3.0",
47+
"@rollup/plugin-commonjs": "^20.0.0",
48+
"@rollup/plugin-eslint": "^8.0.1",
49+
"@rollup/plugin-node-resolve": "^13.0.0",
50+
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.0",
51+
"babel-jest": "^27.0.6",
5152
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
52-
"canvas": "^2.6.1",
53+
"canvas": "^2.7.0",
5354
"enzyme": "^3.11.0",
54-
"eslint": "^7.8.1",
55+
"eslint": "^7.32.0",
5556
"eslint-config-prettier": "^8.1.0",
5657
"eslint-plugin-eslint-comments": "^3.2.0",
5758
"eslint-plugin-import": "^2.22.0",
5859
"eslint-plugin-jest": "^24.0.0",
59-
"eslint-plugin-prettier": "^3.1.4",
60+
"eslint-plugin-prettier": "^4.0.0",
6061
"eslint-plugin-react": "^7.20.6",
61-
"husky": "^5.1.1",
62-
"jest": "^26.4.2",
63-
"lint-staged": "^10.3.0",
62+
"husky": "^7.0.1",
63+
"jest": "^27.0.6",
64+
"jsdom": "^17.0.0",
65+
"lint-staged": "^11.0.0",
6466
"prettier": "^2.1.1",
65-
"prettier-standard": "^16.4.1",
6667
"prop-types": "^15.7.2",
6768
"react": "*",
6869
"react-dom": "*",
6970
"rollup": "^2.26.11",
70-
"rollup-plugin-eslint": "^7.0.0",
7171
"rollup-plugin-terser": "^7.0.2"
7272
},
7373
"dependencies": {

rollup.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import babel from '@rollup/plugin-babel';
22
import commonjs from '@rollup/plugin-commonjs';
3-
import { eslint } from 'rollup-plugin-eslint';
3+
import eslint from '@rollup/plugin-eslint';
44
import { nodeResolve } from '@rollup/plugin-node-resolve';
55
import { terser } from 'rollup-plugin-terser';
66

0 commit comments

Comments
 (0)