Merge branch 'develop'

.eslintrc.js

@@ -12,6 +12,7 @@ module.exports = {
   ],
   plugins: ["prettier"],
   rules: {
+    "import/no-unresolved": "error",
     "prettier/prettier": [
       "error",
       {
@@ -58,6 +59,9 @@ module.exports = {
     react: {
       version: "detect"
     },
+    "import/parsers": {
+      "@typescript-eslint/parser": [".ts", ".tsx"]
+    },
     "import/resolver": {
       // use <root>/tsconfig.json
       typescript: {}

examples/playground/src/index.tsx

@@ -1,7 +1,7 @@
 /* eslint-env node, browser */
 
-import React from 'react';
-import ReactDOM from 'react-dom';
+import * as React from 'react';
+import {render} from 'react-dom';
 import App from './App';
 
-ReactDOM.render(<App />, document.getElementById('root'));
+render(<App />, document.getElementById('root'));

examples/playground/src/options.tsx

@@ -1,6 +1,6 @@
 /* eslint-env node, browser */
 
-import React from 'react';
+import * as React from 'react';
 
 import {CheckboxGroup, RadioGroup, Form} from 'formsy-react-components';
 

examples/refs/src/index.tsx

@@ -1,7 +1,7 @@
 /* eslint-env node, browser */
 
-import React from 'react';
-import ReactDOM from 'react-dom';
+import * as React from 'react';
+import {render} from 'react-dom';
 
 import {
   Form,
@@ -105,4 +105,4 @@ class App extends React.Component {
   }
 }
 
-ReactDOM.render(<App />, document.getElementById('root'));
+render(<App />, document.getElementById('root'));

src/components/__tests__/input-test.tsx

@@ -1,6 +1,6 @@
 /* globals jest, describe, it, expect, beforeEach */
 
-import React from 'react';
+import * as React from 'react';
 import {mount} from 'enzyme';
 
 import Input from '../input';

src/components/__tests__/test-helper.ts

@@ -1,4 +1,4 @@
 import {configure} from 'enzyme';
-import EnzymeAdapter from 'enzyme-adapter-react-16';
+import EnzymeAdapter from 'enzyme-adapter-react-16'; // eslint-disable-line import/default
 
 configure({adapter: new EnzymeAdapter()});

src/components/controls/input.tsx

@@ -1,5 +1,5 @@
-import React from 'react';
-import classNames from 'classnames/dedupe';
+import * as React from 'react';
+import classNames from 'classnames/dedupe'; // eslint-disable-line import/default
 import {ClassValue} from 'classnames/types'; // eslint-disable-line import/no-unresolved
 
 const defaultProps = {

src/components/controls/select.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import classNames from 'classnames/dedupe';
+import classNames from 'classnames/dedupe'; // eslint-disable-line import/default
 import {CommonProps} from './common-prop-types';
 
 type ControlProps = React.SelectHTMLAttributes<HTMLSelectElement>;

src/components/controls/textarea.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import classNames from 'classnames/dedupe';
+import classNames from 'classnames/dedupe'; // eslint-disable-line import/default
 import {CommonProps} from './common-prop-types';
 
 type ControlProps = React.TextareaHTMLAttributes<HTMLTextAreaElement>;

src/components/label.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import classNames from 'classnames/dedupe';
+import classNames from 'classnames/dedupe'; // eslint-disable-line import/default
 import RequiredSymbol from './required-symbol';
 import {ClassValue} from 'classnames/types'; // eslint-disable-line import/no-unresolved
 import {LayoutType} from '../types';

src/components/row.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import classNames from 'classnames/dedupe';
-import Label from './label';
+import classNames from 'classnames/dedupe'; // eslint-disable-line import/default
 import {ClassValue} from 'classnames/types'; // eslint-disable-line import/no-unresolved
+import Label from './label';
 import {LayoutType} from '../types';
 
 interface RowProps {

src/components/select.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import classNames from 'classnames/dedupe';
+import classNames from 'classnames/dedupe'; // eslint-disable-line import/default
 import {componentDefaultProps} from './component-common';
 import ErrorMessages from './error-messages';
 import Help from './help';

src/form.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import classNames from 'classnames/dedupe';
-import Formsy, {FormsyProps} from 'formsy-react';
+import classNames from 'classnames/dedupe'; // eslint-disable-line import/default
 import {ClassValue} from 'classnames/types'; // eslint-disable-line import/no-unresolved
+import Formsy, {FormsyProps} from 'formsy-react';
 import {LayoutType} from './types';
 import FrcContext from './context/frc';
 

src/hoc/__tests__/component-test.tsx

@@ -1,6 +1,6 @@
 /* globals describe, expect, it */
 
-import React from 'react';
+import * as React from 'react';
 import Formsy, {withFormsy} from 'formsy-react';
 import {mount} from 'enzyme';
 import withFRC from '../component';

src/hoc/component.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import FrcContext from '../context/frc';
 import {
   getId,