Skip to content

Commit f4b9437

Browse files
jquensekyletsang
andauthored
chore: bump deps (react-bootstrap#5689)
* WIP * Apply suggestions from code review Co-authored-by: Kyle Tsang <[email protected]> Co-authored-by: Kyle Tsang <[email protected]>
1 parent e3dba84 commit f4b9437

File tree

7 files changed

+681
-987
lines changed

7 files changed

+681
-987
lines changed

.eslintrc

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
{
2-
"extends": [
3-
"@react-bootstrap",
4-
"4catalyzer-typescript",
5-
"prettier",
6-
"prettier/react",
7-
"prettier/@typescript-eslint"
8-
],
9-
"plugins": [
10-
"prettier"
11-
],
2+
"extends": ["@react-bootstrap", "4catalyzer-typescript", "prettier"],
3+
"plugins": ["prettier"],
124
"rules": {
135
"import/extensions": "off",
146
"prettier/prettier": "warn"

karma.conf.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,16 @@ module.exports = (config) => {
3232
resolve: {
3333
symlinks: false,
3434
extensions: ['.js', '.jsx', '.ts', '.tsx'],
35+
// for Enzyme/Cheerio
36+
fallback: { stream: require.resolve('stream-browserify') },
3537
},
3638
plugins: [
3739
new DefinePlugin({
3840
__DEV__: true,
3941
'process.env.NODE_ENV': JSON.stringify('test'),
4042
}),
4143
],
42-
devtool: 'cheap-module-inline-source-map',
44+
devtool: 'inline-cheap-module-source-map',
4345
stats: 'minimal',
4446
},
4547

package.json

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@
6161
"trailingComma": "all"
6262
},
6363
"dependencies": {
64-
"@babel/runtime": "^7.4.2",
64+
"@babel/runtime": "^7.13.8",
6565
"@restart/context": "^2.1.4",
66-
"@restart/hooks": "^0.3.21",
66+
"@restart/hooks": "^0.3.26",
6767
"@types/classnames": "^2.2.10",
6868
"@types/invariant": "^2.2.33",
6969
"@types/prop-types": "^15.7.3",
7070
"@types/react": ">=16.9.35",
71-
"@types/react-transition-group": "^4.4.0",
71+
"@types/react-transition-group": "^4.4.1",
7272
"@types/warning": "^3.0.0",
7373
"classnames": "^2.2.6",
7474
"dom-helpers": "^5.1.2",
@@ -77,20 +77,20 @@
7777
"prop-types-extra": "^1.1.0",
7878
"react-overlays": "^5.0.0",
7979
"react-transition-group": "^4.4.1",
80-
"uncontrollable": "^7.0.0",
80+
"uncontrollable": "^7.2.1",
8181
"warning": "^4.0.3"
8282
},
8383
"devDependencies": {
8484
"@4c/rollout": "^2.2.0",
8585
"@4c/tsconfig": "^0.3.1",
86-
"@babel/cli": "^7.12.17",
87-
"@babel/core": "^7.12.17",
88-
"@babel/preset-typescript": "^7.12.17",
89-
"@babel/register": "^7.12.13",
86+
"@babel/cli": "^7.13.0",
87+
"@babel/core": "^7.13.8",
88+
"@babel/preset-typescript": "^7.13.0",
89+
"@babel/register": "^7.13.8",
9090
"@react-bootstrap/babel-preset": "^1.2.0",
9191
"@react-bootstrap/eslint-config": "^1.3.2",
92-
"@typescript-eslint/eslint-plugin": "^3.10.1",
93-
"@typescript-eslint/parser": "^3.10.1",
92+
"@typescript-eslint/eslint-plugin": "^4.16.1",
93+
"@typescript-eslint/parser": "^4.16.1",
9494
"babel-eslint": "^10.1.0",
9595
"babel-loader": "^8.2.2",
9696
"babel-plugin-istanbul": "^6.0.0",
@@ -104,8 +104,8 @@
104104
"dtslint": "^4.0.7",
105105
"enzyme": "^3.11.0",
106106
"enzyme-adapter-react-16": "^1.15.6",
107-
"eslint": "^7.20.0",
108-
"eslint-config-4catalyzer-typescript": "^2.0.4",
107+
"eslint": "^7.21.0",
108+
"eslint-config-4catalyzer-typescript": "^3.0.3",
109109
"eslint-import-resolver-node": "^0.3.4",
110110
"eslint-import-resolver-webpack": "^0.13.0",
111111
"eslint-plugin-import": "^2.22.1",
@@ -115,8 +115,8 @@
115115
"eslint-plugin-react": "^7.22.0",
116116
"execa": "^5.0.0",
117117
"fs-extra": "^9.1.0",
118-
"husky": "^4.3.8",
119-
"karma": "^5.2.3",
118+
"husky": "^4.0.0",
119+
"karma": "^6.1.1",
120120
"karma-chrome-launcher": "^3.1.0",
121121
"karma-cli": "^2.0.0",
122122
"karma-coverage": "^2.0.3",
@@ -125,7 +125,7 @@
125125
"karma-mocha-reporter": "^2.2.5",
126126
"karma-sinon-chai": "^2.0.2",
127127
"karma-sourcemap-loader": "^0.3.8",
128-
"karma-webpack": "^4.0.2",
128+
"karma-webpack": "^5.0.0",
129129
"lint-staged": "^10.5.4",
130130
"lodash": "^4.17.21",
131131
"mocha": "^8.3.0",
@@ -136,8 +136,9 @@
136136
"simulant": "^0.2.2",
137137
"sinon": "^9.2.4",
138138
"sinon-chai": "^3.5.0",
139-
"typescript": "^4.1.5",
140-
"webpack": "^4.46.0"
139+
"stream-browserify": "^3.0.0",
140+
"typescript": "^4.2.2",
141+
"webpack": "^5.24.2"
141142
},
142143
"peerDependencies": {
143144
"react": ">=16.8.0",

src/DropdownMenu.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ const defaultProps: Partial<DropdownMenuProps> = {
115115
flip: true,
116116
};
117117

118-
119118
const DropdownMenu: DropdownMenu = React.forwardRef(
120119
(
121120
{

src/OverlayTrigger.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ function normalizeDelay(delay?: OverlayDelay) {
5656
// for cases when the trigger is disabled and mouseOut/Over can cause flicker
5757
// moving from one child element to another.
5858
function handleMouseOverOut(
59+
// eslint-disable-next-line @typescript-eslint/no-shadow
5960
handler: (...args: [React.MouseEvent, ...any[]]) => any,
6061
args: [React.MouseEvent, ...any[]],
6162
relatedNative: 'fromElement' | 'toElement',

src/ProgressBar.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ function onlyProgressBar(props, propName, componentName): Error | null {
4545
*
4646
* see https://github.com/gaearon/react-hot-loader#checking-element-types
4747
*/
48+
// eslint-disable-next-line @typescript-eslint/no-use-before-define
4849
const element = <ProgressBar />;
4950
if (child.type === element.type) return;
5051

0 commit comments

Comments
 (0)