Skip to content

Commit 4a9239f

Browse files
committed
Merge branch 'develop'
2 parents efdfa2d + e892733 commit 4a9239f

File tree

15 files changed

+25
-21
lines changed

15 files changed

+25
-21
lines changed

.eslintrc.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ module.exports = {
1212
],
1313
plugins: ["prettier"],
1414
rules: {
15+
"import/no-unresolved": "error",
1516
"prettier/prettier": [
1617
"error",
1718
{
@@ -58,6 +59,9 @@ module.exports = {
5859
react: {
5960
version: "detect"
6061
},
62+
"import/parsers": {
63+
"@typescript-eslint/parser": [".ts", ".tsx"]
64+
},
6165
"import/resolver": {
6266
// use <root>/tsconfig.json
6367
typescript: {}

examples/playground/src/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env node, browser */
22

3-
import React from 'react';
4-
import ReactDOM from 'react-dom';
3+
import * as React from 'react';
4+
import {render} from 'react-dom';
55
import App from './App';
66

7-
ReactDOM.render(<App />, document.getElementById('root'));
7+
render(<App />, document.getElementById('root'));

examples/playground/src/options.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-env node, browser */
22

3-
import React from 'react';
3+
import * as React from 'react';
44

55
import {CheckboxGroup, RadioGroup, Form} from 'formsy-react-components';
66

examples/refs/src/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env node, browser */
22

3-
import React from 'react';
4-
import ReactDOM from 'react-dom';
3+
import * as React from 'react';
4+
import {render} from 'react-dom';
55

66
import {
77
Form,
@@ -105,4 +105,4 @@ class App extends React.Component {
105105
}
106106
}
107107

108-
ReactDOM.render(<App />, document.getElementById('root'));
108+
render(<App />, document.getElementById('root'));

src/components/__tests__/input-test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* globals jest, describe, it, expect, beforeEach */
22

3-
import React from 'react';
3+
import * as React from 'react';
44
import {mount} from 'enzyme';
55

66
import Input from '../input';
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import {configure} from 'enzyme';
2-
import EnzymeAdapter from 'enzyme-adapter-react-16';
2+
import EnzymeAdapter from 'enzyme-adapter-react-16'; // eslint-disable-line import/default
33

44
configure({adapter: new EnzymeAdapter()});

src/components/controls/input.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React from 'react';
2-
import classNames from 'classnames/dedupe';
1+
import * as React from 'react';
2+
import classNames from 'classnames/dedupe'; // eslint-disable-line import/default
33
import {ClassValue} from 'classnames/types'; // eslint-disable-line import/no-unresolved
44

55
const defaultProps = {

src/components/controls/select.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import classNames from 'classnames/dedupe';
2+
import classNames from 'classnames/dedupe'; // eslint-disable-line import/default
33
import {CommonProps} from './common-prop-types';
44

55
type ControlProps = React.SelectHTMLAttributes<HTMLSelectElement>;

src/components/controls/textarea.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import classNames from 'classnames/dedupe';
2+
import classNames from 'classnames/dedupe'; // eslint-disable-line import/default
33
import {CommonProps} from './common-prop-types';
44

55
type ControlProps = React.TextareaHTMLAttributes<HTMLTextAreaElement>;

src/components/label.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import classNames from 'classnames/dedupe';
2+
import classNames from 'classnames/dedupe'; // eslint-disable-line import/default
33
import RequiredSymbol from './required-symbol';
44
import {ClassValue} from 'classnames/types'; // eslint-disable-line import/no-unresolved
55
import {LayoutType} from '../types';

0 commit comments

Comments
 (0)