Skip to content

Commit 54c5a52

Browse files
tkrotofftkrotoff
committed
Update npm packages + Prettier 2
1 parent 7b02846 commit 54c5a52

File tree

39 files changed

+4106
-4088
lines changed

39 files changed

+4106
-4088
lines changed

‎.eslintrc.js‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ const config = {
4242
'spaced-comment': 'off',
4343
'no-lonely-if': 'off',
4444
'max-classes-per-file': 'off',
45-
4645
// [no-return-assign should be configurable to ignore arrow-functions](https://github.com/eslint/eslint/issues/9471)
4746
'no-return-assign': 'off',
47+
camelcase: 'off',
4848

4949
'prettier/prettier': 'error',
5050

@@ -53,9 +53,13 @@ const config = {
5353
'import/prefer-default-export': 'off',
5454
'import/extensions': 'off',
5555

56-
'jsx-a11y/label-has-for': 'off',
57-
'jsx-a11y/label-has-associated-control': 'off',
58-
'jsx-a11y/iframe-has-title': 'off',
56+
// https://github.com/typescript-eslint/typescript-eslint/blob/v4.1.0/packages/eslint-plugin/docs/rules/no-use-before-define.md
57+
'no-use-before-define': 'off',
58+
'@typescript-eslint/no-use-before-define': 'error',
59+
60+
// https://github.com/typescript-eslint/typescript-eslint/blob/v4.1.0/packages/eslint-plugin/docs/rules/no-shadow.md
61+
'no-shadow': 'off',
62+
'@typescript-eslint/no-shadow': 'error',
5963

6064
'@typescript-eslint/indent': 'off',
6165
'@typescript-eslint/explicit-function-return-type': 'off',
@@ -65,9 +69,15 @@ const config = {
6569
'@typescript-eslint/no-empty-interface': 'off',
6670
'@typescript-eslint/explicit-member-accessibility': 'off',
6771
'@typescript-eslint/no-explicit-any': 'off',
72+
'@typescript-eslint/ban-ts-comment': 'off',
6873
'@typescript-eslint/no-parameter-properties': 'off',
6974
'@typescript-eslint/array-type': 'off',
7075
'@typescript-eslint/ban-ts-ignore': 'off',
76+
'@typescript-eslint/explicit-module-boundary-types': 'off',
77+
78+
'jsx-a11y/label-has-for': 'off',
79+
'jsx-a11y/label-has-associated-control': 'off',
80+
'jsx-a11y/iframe-has-title': 'off',
7181

7282
'react/no-unescaped-entities': 'off',
7383
'react/jsx-filename-extension': ['error', { extensions: ['.tsx', '.jsx'] }],
@@ -90,6 +100,12 @@ const config = {
90100
rules: {
91101
'@typescript-eslint/no-var-requires': 'off'
92102
}
103+
},
104+
{
105+
files: ['examples/*/*.tsx'],
106+
rules: {
107+
'react/require-default-props': 'off'
108+
}
93109
}
94110
]
95111
};

‎examples/Bootstrap4/App.test.e2e.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ test('john/123456/12345', async () => {
1616
const username = await page.$('input[name=username]');
1717
await username.click();
1818
await username.type('john');
19-
await page.waitFor('input[name=username] ~ span[data-feedback].invalid-feedback');
19+
await page.waitForSelector('input[name=username] ~ span[data-feedback].invalid-feedback');
2020
//const usernameFeedbacks = await page.$$('input[name=username] ~ span[data-feedback]');
2121
const usernameFeedbacks = await username.$x('./following-sibling::span[@data-feedback]');
2222
expect(usernameFeedbacks).toHaveLength(1);
@@ -25,7 +25,7 @@ test('john/123456/12345', async () => {
2525
const password = await page.$('input[name=password]');
2626
await password.click();
2727
await password.type('123456');
28-
await page.waitFor('input[name=password] ~ span[data-feedback]');
28+
await page.waitForSelector('input[name=password] ~ span[data-feedback]');
2929
const passwordFeedbacks = await page.$$('input[name=password] ~ span[data-feedback]');
3030
expect(passwordFeedbacks).toHaveLength(4);
3131
await expect(passwordFeedbacks[0]).toMatch('Should contain small letters');
@@ -52,7 +52,7 @@ test('jimmy/12345/12345', async () => {
5252
const username = await page.$('input[name=username]');
5353
await username.click();
5454
await username.type('jimmy');
55-
await page.waitFor('input[name=username] ~ span[data-feedback].valid-feedback');
55+
await page.waitForSelector('input[name=username] ~ span[data-feedback].valid-feedback');
5656
//const usernameFeedbacks = await page.$$('input[name=username] ~ span[data-feedback]');
5757
const usernameFeedbacks = await username.$x('./following-sibling::span[@data-feedback]');
5858
expect(usernameFeedbacks).toHaveLength(2);
@@ -62,7 +62,7 @@ test('jimmy/12345/12345', async () => {
6262
const password = await page.$('input[name=password]');
6363
await password.click();
6464
await password.type('12345');
65-
await page.waitFor('input[name=password] ~ span[data-feedback]');
65+
await page.waitForSelector('input[name=password] ~ span[data-feedback]');
6666
const passwordFeedbacks = await page.$$('input[name=password] ~ span[data-feedback]');
6767
expect(passwordFeedbacks).toHaveLength(4);
6868
await expect(passwordFeedbacks[0]).toMatch('Should contain small letters');

‎examples/Bootstrap4/package.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
"test:e2e": "jest --config jest-e2e.config.js --verbose"
2323
},
2424
"dependencies": {
25-
"bootstrap": "^4.4.1",
26-
"core-js": "^3.6.4",
25+
"bootstrap": "^4.5.3",
26+
"core-js": "^3.6.5",
2727
"lodash-es": "^4.17.15",
2828
"raf": "^3.4.1",
29-
"react": "^16.13.0",
30-
"react-dom": "^16.13.0",
29+
"react": "^16.14.0",
30+
"react-dom": "^16.14.0",
3131
"react-form-with-constraints": "^0.15.2",
3232
"react-form-with-constraints-bootstrap4": "^0.15.2",
3333
"react-form-with-constraints-tools": "^0.15.2"
@@ -36,20 +36,20 @@
3636
"@babel/core": "^7.12.3",
3737
"@babel/preset-env": "^7.12.1",
3838
"@babel/preset-react": "^7.12.1",
39-
"babel-loader": "^8.0.6",
40-
"css-loader": "^3.4.2",
41-
"file-loader": "^5.1.0",
42-
"http-server": "^0.12.1",
43-
"jest": "^25.1.0",
39+
"babel-loader": "^8.1.0",
40+
"css-loader": "^5.0.0",
41+
"file-loader": "^6.1.1",
42+
"http-server": "^0.12.3",
43+
"jest": "^26.6.0",
4444
"jest-puppeteer": "^4.4.0",
45-
"node-sass": "^4.13.1",
46-
"postcss-loader": "^3.0.0",
45+
"node-sass": "^4.14.1",
46+
"postcss-loader": "^4.0.4",
4747
"postcss-preset-env": "^6.7.0",
48-
"puppeteer": "^2.1.1",
49-
"sass-loader": "^8.0.2",
50-
"style-loader": "^1.1.3",
51-
"webpack": "^4.41.6",
52-
"webpack-cli": "^3.3.11",
53-
"webpack-dev-server": "^3.10.3"
48+
"puppeteer": "^5.3.1",
49+
"sass-loader": "^10.0.3",
50+
"style-loader": "^2.0.0",
51+
"webpack": "^4.44.2",
52+
"webpack-cli": "^3.3.12",
53+
"webpack-dev-server": "^3.11.0"
5454
}
5555
}

‎examples/Bootstrap4/webpack.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const config = {
3333
{
3434
loader: 'postcss-loader',
3535
options: {
36-
plugins: () => [postcssPresetEnv],
36+
postcssOptions: { plugins: [['postcss-preset-env']] },
3737
sourceMap: true
3838
}
3939
},

‎examples/ClubMembers/App.tsx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,20 @@ class Club {
9090
}
9191
}
9292

93+
class Input extends _Input {
94+
static defaultProps: InputProps = {
95+
classes: {
96+
// https://github.com/facebook/react/issues/3725#issuecomment-169163998
97+
// [React.Component.defaultProps objects are overridden, not merged?](https://stackoverflow.com/q/40428847)
98+
..._Input.defaultProps.classes,
99+
hasErrors: 'is-invalid',
100+
hasWarnings: undefined,
101+
hasInfos: undefined,
102+
isValid: 'is-valid'
103+
}
104+
};
105+
}
106+
93107
interface HobbiesProps {
94108
memberIndex: number;
95109
member: Member;
@@ -361,20 +375,6 @@ class Form extends React.Component<FormProps> {
361375
}
362376
}
363377

364-
class Input extends _Input {
365-
static defaultProps: InputProps = {
366-
classes: {
367-
// https://github.com/facebook/react/issues/3725#issuecomment-169163998
368-
// [React.Component.defaultProps objects are overridden, not merged?](https://stackoverflow.com/q/40428847)
369-
..._Input.defaultProps.classes,
370-
hasErrors: 'is-invalid',
371-
hasWarnings: undefined,
372-
hasInfos: undefined,
373-
isValid: 'is-valid'
374-
}
375-
};
376-
}
377-
378378
function App() {
379379
return (
380380
<div className="container">

‎examples/ClubMembers/package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
"build:watch": "webpack -d --watch"
1818
},
1919
"dependencies": {
20-
"mobx": "^5.15.4",
21-
"mobx-react": "^6.1.8",
22-
"react": "^16.13.0",
23-
"react-dom": "^16.13.0",
20+
"mobx": "^5.15.7",
21+
"mobx-react": "^6.3.1",
22+
"react": "^16.14.0",
23+
"react-dom": "^16.14.0",
2424
"react-form-with-constraints": "^0.15.2",
2525
"react-form-with-constraints-tools": "^0.15.2"
2626
},
@@ -30,14 +30,14 @@
3030
"@babel/plugin-proposal-decorators": "^7.12.1",
3131
"@babel/preset-react": "^7.12.1",
3232
"@babel/preset-typescript": "^7.12.1",
33-
"@types/node": "^13.7.6",
34-
"@types/react": "^16.9.23",
35-
"@types/react-dom": "^16.9.5",
36-
"@types/webpack": "^4.41.6",
37-
"file-loader": "^5.1.0",
38-
"ts-node": "^8.6.2",
39-
"typescript": "^3.8.2",
40-
"webpack": "^4.41.6",
41-
"webpack-cli": "^3.3.11"
33+
"@types/node": "^14.11.10",
34+
"@types/react": "^16.9.53",
35+
"@types/react-dom": "^16.9.8",
36+
"@types/webpack": "^4.41.22",
37+
"file-loader": "^6.1.1",
38+
"ts-node": "^9.0.0",
39+
"typescript": "^4.0.3",
40+
"webpack": "^4.44.2",
41+
"webpack-cli": "^3.3.12"
4242
}
4343
}

‎examples/HTML5ConstraintValidationAPI/package.json‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,21 @@
1919
"build:watch": "webpack -d --watch"
2020
},
2121
"dependencies": {
22-
"react": "^16.13.0",
23-
"react-dom": "^16.13.0"
22+
"react": "^16.14.0",
23+
"react-dom": "^16.14.0"
2424
},
2525
"devDependencies": {
2626
"@babel/core": "^7.12.3",
2727
"@babel/preset-react": "^7.12.1",
2828
"@babel/preset-typescript": "^7.12.1",
29-
"@types/node": "^13.7.6",
30-
"@types/react": "^16.9.23",
31-
"@types/react-dom": "^16.9.5",
32-
"@types/webpack": "^4.41.6",
33-
"babel-loader": "^8.1.0",
34-
"file-loader": "^5.1.0",
35-
"ts-node": "^8.6.2",
36-
"typescript": "^3.8.2",
37-
"webpack": "^4.41.6",
38-
"webpack-cli": "^3.3.11"
29+
"@types/node": "^14.11.10",
30+
"@types/react": "^16.9.53",
31+
"@types/react-dom": "^16.9.8",
32+
"@types/webpack": "^4.41.22",
33+
"file-loader": "^6.1.1",
34+
"ts-node": "^9.0.0",
35+
"typescript": "^4.0.3",
36+
"webpack": "^4.44.2",
37+
"webpack-cli": "^3.3.12"
3938
}
4039
}

‎examples/MaterialUI/package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"build:watch": "webpack -d --watch"
2020
},
2121
"dependencies": {
22-
"@material-ui/core": "^4.9.4",
23-
"lodash": "^4.17.15",
24-
"react": "^16.13.0",
25-
"react-dom": "^16.13.0",
22+
"@material-ui/core": "^4.11.0",
23+
"lodash": "^4.17.20",
24+
"react": "^16.14.0",
25+
"react-dom": "^16.14.0",
2626
"react-form-with-constraints": "^0.15.2",
2727
"react-form-with-constraints-material-ui": "^0.15.2",
2828
"react-form-with-constraints-tools": "^0.15.2"
@@ -31,15 +31,15 @@
3131
"@babel/core": "^7.12.3",
3232
"@babel/preset-react": "^7.12.1",
3333
"@babel/preset-typescript": "^7.12.1",
34-
"@types/lodash": "^4.14.149",
35-
"@types/node": "^13.7.6",
36-
"@types/react": "^16.9.23",
37-
"@types/react-dom": "^16.9.5",
38-
"@types/webpack": "^4.41.6",
39-
"file-loader": "^5.1.0",
40-
"ts-node": "^8.6.2",
41-
"typescript": "^3.8.2",
42-
"webpack": "^4.41.6",
43-
"webpack-cli": "^3.3.11"
34+
"@types/lodash": "^4.14.162",
35+
"@types/node": "^14.11.10",
36+
"@types/react": "^16.9.53",
37+
"@types/react-dom": "^16.9.8",
38+
"@types/webpack": "^4.41.22",
39+
"file-loader": "^6.1.1",
40+
"ts-node": "^9.0.0",
41+
"typescript": "^4.0.3",
42+
"webpack": "^4.44.2",
43+
"webpack-cli": "^3.3.12"
4444
}
4545
}

‎examples/Password/App.test.e2e.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ test('john@beatles/123456/12345', async () => {
1515
const email = (await page.$('input[name=email]'))!;
1616
await email.click();
1717
await email.type('john@beatles');
18-
await page.waitFor('input[name=email] ~ span[data-feedback]');
18+
await page.waitForSelector('input[name=email] ~ span[data-feedback]');
1919
//const emailFeedbacks = await page.$$('input[name=email] ~ span[data-feedback]');
2020
const emailFeedbacks = await email.$x('./following-sibling::span[@data-feedback]');
2121
expect(emailFeedbacks).toHaveLength(1);
@@ -24,7 +24,7 @@ test('john@beatles/123456/12345', async () => {
2424
const password = (await page.$('input[name=password]'))!;
2525
await password.click();
2626
await password.type('123456');
27-
await page.waitFor('input[name=password] ~ span[data-feedback].when-valid');
27+
await page.waitForSelector('input[name=password] ~ span[data-feedback].when-valid');
2828
const passwordFeedbacks = await page.$$('input[name=password] ~ span[data-feedback]');
2929
expect(passwordFeedbacks).toHaveLength(5);
3030
await expect(passwordFeedbacks[0]).toMatch('Should contain small letters');
@@ -52,7 +52,7 @@ test('john@beatles/Tr0ub4dor&3/Tr0ub4dor&3', async () => {
5252
const email = (await page.$('input[name=email]'))!;
5353
await email.click();
5454
await email.type('john@beatles');
55-
await page.waitFor('input[name=email] ~ span[data-feedback]');
55+
await page.waitForSelector('input[name=email] ~ span[data-feedback]');
5656
//const emailFeedbacks = await page.$$('input[name=email] ~ span[data-feedback]');
5757
const emailFeedbacks = await email.$x('./following-sibling::span[@data-feedback]');
5858
expect(emailFeedbacks).toHaveLength(1);
@@ -61,7 +61,7 @@ test('john@beatles/Tr0ub4dor&3/Tr0ub4dor&3', async () => {
6161
const password = (await page.$('input[name=password]'))!;
6262
await password.click();
6363
await password.type('Tr0ub4dor&3');
64-
await page.waitFor('input[name=password] ~ span[data-feedback].when-valid');
64+
await page.waitForSelector('input[name=password] ~ span[data-feedback].when-valid');
6565
const passwordFeedbacks = await page.$$('input[name=password] ~ span[data-feedback]');
6666
expect(passwordFeedbacks).toHaveLength(1);
6767
await expect(passwordFeedbacks[0]).toMatch('Looks good!');

‎examples/Password/package.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,34 @@
1818
"test:e2e": "jest --config jest-e2e.config.js --verbose"
1919
},
2020
"dependencies": {
21-
"react": "^16.13.0",
22-
"react-dom": "^16.13.0",
21+
"react": "^16.14.0",
22+
"react-dom": "^16.14.0",
2323
"react-form-with-constraints": "^0.15.2",
2424
"react-form-with-constraints-tools": "^0.15.2"
2525
},
2626
"devDependencies": {
2727
"@babel/core": "^7.12.3",
2828
"@babel/preset-react": "^7.12.1",
2929
"@babel/preset-typescript": "^7.12.1",
30-
"@types/circular-dependency-plugin": "^5.0.0",
31-
"@types/expect-puppeteer": "^4.4.0",
32-
"@types/jest": "^25.1.3",
33-
"@types/jest-environment-puppeteer": "^4.3.1",
34-
"@types/node": "^13.7.6",
35-
"@types/puppeteer": "^2.0.1",
36-
"@types/react": "^16.9.23",
37-
"@types/react-dom": "^16.9.5",
38-
"@types/webpack": "^4.41.6",
30+
"@types/circular-dependency-plugin": "^5.0.1",
31+
"@types/expect-puppeteer": "^4.4.3",
32+
"@types/jest": "^26.0.14",
33+
"@types/jest-environment-puppeteer": "^4.4.0",
34+
"@types/node": "^14.11.10",
35+
"@types/puppeteer": "^3.0.2",
36+
"@types/react": "^16.9.53",
37+
"@types/react-dom": "^16.9.8",
38+
"@types/webpack": "^4.41.22",
3939
"circular-dependency-plugin": "^5.2.0",
40-
"file-loader": "^5.1.0",
41-
"http-server": "^0.12.1",
42-
"jest": "^25.1.0",
40+
"file-loader": "^6.1.1",
41+
"http-server": "^0.12.3",
42+
"jest": "^26.6.0",
4343
"jest-puppeteer": "^4.4.0",
44-
"puppeteer": "^2.1.1",
45-
"ts-jest": "^25.2.1",
46-
"ts-node": "^8.6.2",
47-
"typescript": "^3.8.2",
48-
"webpack": "^4.41.6",
49-
"webpack-cli": "^3.3.11"
44+
"puppeteer": "^5.3.1",
45+
"ts-jest": "^26.4.1",
46+
"ts-node": "^9.0.0",
47+
"typescript": "^4.0.3",
48+
"webpack": "^4.44.2",
49+
"webpack-cli": "^3.3.12"
5050
}
5151
}

0 commit comments

Comments
 (0)