Merge branch 'develop'

Author: michaeldzjap

.eslintignore

@@ -1,3 +1,4 @@
+coverage
 dist
 example/dist
 example/node_modules

.eslintrc.json

@@ -29,8 +29,7 @@
     "plugin:react/recommended",
     "plugin:jest/recommended",
     "plugin:eslint-comments/recommended",
-    "plugin:prettier/recommended",
-    "prettier/standard"
+    "plugin:prettier/recommended"
   ],
   "rules": {
     "prettier/prettier": "error",

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -0,0 +1,5 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx --no-install lint-staged
+npm test

.travis.yml

@@ -2,6 +2,7 @@ language: node_js
 node_js:
   - "node"
 env:
+  - HUSKY=0
   - CODECOV_TOKEN="88b89344-8051-4bc1-aa42-f6428b99355b"
 cache:
   directories:

__tests__/config.js

@@ -1,4 +1,4 @@
 import { configure } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 
 configure({ adapter: new Adapter() });

example/package-lock.json

@@ -15,7 +15,8 @@
     "prod": "npm run production",
     "watch": "NODE_ENV=local ./node_modules/.bin/rollup --config --watch",
     "lint": "./node_modules/.bin/eslint ./",
-    "clean": "rm -rf dist"
+    "clean": "rm -rf dist",
+    "postinstall": "husky install"
   },
   "keywords": [
     "react",
@@ -31,8 +32,8 @@
     "url": "https://github.com/michaeldzjap/react-signature-pad-wrapper/issues"
   },
   "peerDependencies": {
-    "react": "^15.5.0 || ^16.0.0 || ^17.0.0",
-    "react-dom": "^15.5.0 || ^16.0.0 || ^17.0.0"
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.11.6",
@@ -42,42 +43,38 @@
     "@babel/preset-env": "^7.11.5",
     "@babel/preset-react": "^7.10.4",
     "@rollup/plugin-babel": "^5.2.1",
-    "@rollup/plugin-commonjs": "^16.0.0",
-    "@rollup/plugin-node-resolve": "^10.0.0",
+    "@rollup/plugin-commonjs": "^17.0.0",
+    "@rollup/plugin-node-resolve": "^11.0.1",
+    "@wojtekmaj/enzyme-adapter-react-17": "^0.4.1",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^26.3.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "canvas": "^2.6.1",
     "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.4",
     "eslint": "^7.8.1",
-    "eslint-config-prettier": "^6.11.0",
+    "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-jest": "^24.0.0",
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-react": "^7.20.6",
-    "husky": "^4.3.0",
+    "husky": "^5.1.1",
     "jest": "^26.4.2",
     "lint-staged": "^10.3.0",
     "prettier": "^2.1.1",
     "prettier-standard": "^16.4.1",
     "prop-types": "^15.7.2",
+    "react": "*",
+    "react-dom": "*",
     "rollup": "^2.26.11",
     "rollup-plugin-eslint": "^7.0.0",
-    "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-uglify": "^6.0.4"
+    "rollup-plugin-terser": "^7.0.2"
   },
   "dependencies": {
     "@babel/runtime": "^7.11.2",
     "signature_pad": "^2.3.2",
     "throttle-debounce": "^3.0.0"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
   "lint-staged": {
     "*.js": "eslint --cache --fix"
   }

package-lock.json

@@ -3,12 +3,25 @@ import commonjs from '@rollup/plugin-commonjs';
 import { eslint } from 'rollup-plugin-eslint';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import { terser } from 'rollup-plugin-terser';
-import { uglify } from 'rollup-plugin-uglify';
 
 import pkg from './package.json';
 
-const base = {
+export default {
     input: 'src/index.js',
+    output: [
+        {
+            file: pkg.main,
+            format: 'cjs',
+            sourcemap: true,
+            exports: 'default',
+        },
+        {
+            file: pkg.module,
+            format: 'es',
+            sourcemap: true,
+            exports: 'default',
+        },
+    ],
     external: [...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.peerDependencies || {})],
     watch: {
         include: 'src/**',
@@ -23,32 +36,6 @@ const base = {
         }),
         commonjs(),
         nodeResolve(),
+        terser(),
     ],
 };
-
-export default [
-    {
-        ...base,
-        ...{
-            output: {
-                file: pkg.main,
-                format: 'cjs',
-                sourcemap: true,
-                exports: 'default',
-            },
-            plugins: [...base.plugins, uglify()],
-        },
-    },
-    {
-        ...base,
-        ...{
-            output: {
-                file: pkg.module,
-                format: 'es',
-                sourcemap: true,
-                exports: 'default',
-            },
-            plugins: [...base.plugins, terser()],
-        },
-    },
-];