Skip to content

Commit b73db1b

Browse files
jquensekyletsang
jquense
and
kyletsang
authored
chore: bump deps (#924)
* chore: bump deps * Fix tests and husky config Co-authored-by: kyletsang <[email protected]>
1 parent acaa05d commit b73db1b

File tree

9 files changed

+1339
-1861
lines changed

9 files changed

+1339
-1861
lines changed

‎.eslintrc

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
{
2-
"extends": [
3-
"@react-bootstrap",
4-
"4catalyzer-typescript",
5-
"prettier",
6-
"prettier/react",
7-
"prettier/@typescript-eslint"
8-
],
2+
"extends": ["@react-bootstrap", "4catalyzer-typescript", "prettier"],
93
"plugins": ["prettier"],
104
"rules": {
115
"jsx-a11y/no-autofocus": "off",

‎.husky/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_

‎.husky/pre-commit

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
yarn lint-staged

‎karma.conf.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
const { rules, plugins } = require('webpack-atoms');
2+
const webpack = require('webpack');
23

34
module.exports = (config) => {
45
const { env } = process;
56

67
config.set({
7-
frameworks: ['mocha', 'sinon-chai'],
8+
frameworks: ['mocha', 'webpack', 'sinon-chai'],
89

910
files: ['test/index.js'],
1011

@@ -25,18 +26,22 @@ module.exports = (config) => {
2526
resolve: {
2627
symlinks: false,
2728
extensions: ['.mjs', '.js', '.ts', '.tsx', '.json'],
29+
fallback: {
30+
util: require.resolve('util/'),
31+
// for Enzyme/Cheerio
32+
stream: require.resolve('stream-browserify'),
33+
},
2834
},
2935
plugins: [
3036
plugins.define({
3137
'process.env.NODE_ENV': JSON.stringify('test'),
3238
__DEV__: true,
3339
}),
40+
new webpack.ProvidePlugin({
41+
process: 'process/browser',
42+
}),
3443
],
35-
devtool: 'cheap-module-inline-source-map',
36-
},
37-
38-
webpackMiddleware: {
39-
noInfo: true,
44+
devtool: 'inline-cheap-module-source-map',
4045
},
4146

4247
reporters: ['mocha', 'coverage'],

‎package.json

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,8 @@
4040
"start": "yarn --cwd www start",
4141
"tdd": "cross-env NODE_ENV=test karma start",
4242
"test": "yarn lint && yarn testonly",
43-
"testonly": "yarn tdd --single-run"
44-
},
45-
"husky": {
46-
"hooks": {
47-
"pre-commit": "lint-staged"
48-
}
43+
"testonly": "yarn tdd --single-run",
44+
"prepare": "husky install"
4945
},
5046
"lint-staged": {
5147
"*.js,*.tsx": "eslint --fix --ext .js,.ts,.tsx"
@@ -61,13 +57,13 @@
6157
"conventionalCommits": true
6258
},
6359
"dependencies": {
64-
"@babel/runtime": "^7.12.1",
65-
"@popperjs/core": "^2.5.3",
66-
"@restart/hooks": "^0.3.25",
60+
"@babel/runtime": "^7.13.8",
61+
"@popperjs/core": "^2.8.6",
62+
"@restart/hooks": "^0.3.26",
6763
"@types/warning": "^3.0.0",
6864
"dom-helpers": "^5.2.0",
6965
"prop-types": "^15.7.2",
70-
"uncontrollable": "^7.0.0",
66+
"uncontrollable": "^7.2.1",
7167
"warning": "^4.0.3"
7268
},
7369
"peerDependencies": {
@@ -79,20 +75,20 @@
7975
"@4c/rollout": "^2.2.0",
8076
"@4c/tsconfig": "^0.3.1",
8177
"@babel/cli": "^7.13.0",
82-
"@babel/core": "^7.13.1",
78+
"@babel/core": "^7.13.8",
8379
"@babel/plugin-proposal-class-properties": "^7.13.0",
84-
"@babel/plugin-transform-runtime": "^7.13.6",
80+
"@babel/plugin-transform-runtime": "^7.13.8",
8581
"@babel/polyfill": "^7.12.1",
86-
"@babel/preset-env": "^7.13.5",
82+
"@babel/preset-env": "^7.13.8",
8783
"@babel/preset-react": "^7.12.13",
8884
"@babel/preset-typescript": "^7.13.0",
8985
"@react-bootstrap/eslint-config": "^1.3.2",
90-
"@rollup/plugin-node-resolve": "^9.0.0",
86+
"@rollup/plugin-node-resolve": "^11.2.0",
9187
"@types/classnames": "^2.2.11",
92-
"@types/react": "^16.14.4",
93-
"@types/react-dom": "^16.9.11",
94-
"@typescript-eslint/eslint-plugin": "^4.15.2",
95-
"@typescript-eslint/parser": "^4.15.2",
88+
"@types/react": "^17.0.2",
89+
"@types/react-dom": "^17.0.1",
90+
"@typescript-eslint/eslint-plugin": "^4.16.1",
91+
"@typescript-eslint/parser": "^4.16.1",
9692
"babel-eslint": "^10.1.0",
9793
"babel-plugin-add-module-exports": "^1.0.4",
9894
"babel-plugin-istanbul": "^6.0.0",
@@ -101,47 +97,47 @@
10197
"cross-env": "^7.0.3",
10298
"enzyme": "^3.11.0",
10399
"enzyme-adapter-react-16": "^1.15.6",
104-
"eslint": "^7.20.0",
100+
"eslint": "^7.21.0",
105101
"eslint-config-4catalyzer-typescript": "^3.0.3",
106-
"eslint-config-prettier": "^6.15.0",
102+
"eslint-config-prettier": "^8.1.0",
107103
"eslint-plugin-import": "^2.22.1",
108104
"eslint-plugin-jsx-a11y": "^6.4.1",
109105
"eslint-plugin-mocha": "^8.0.0",
110106
"eslint-plugin-prettier": "^3.3.1",
111107
"eslint-plugin-react": "^7.22.0",
112108
"eslint-plugin-react-hooks": "^4.2.0",
113109
"gh-pages": "^3.1.0",
114-
"husky": "^4.3.8",
110+
"husky": "^5.1.2",
115111
"jquery": "^3.5.1",
116-
"karma": "^5.2.3",
112+
"karma": "^6.1.1",
117113
"karma-chrome-launcher": "^3.1.0",
118114
"karma-coverage": "^2.0.3",
119115
"karma-firefox-launcher": "^2.1.0",
120116
"karma-mocha": "^2.0.1",
121117
"karma-mocha-reporter": "^2.2.5",
122118
"karma-sinon-chai": "^2.0.2",
123119
"karma-sourcemap-loader": "^0.3.8",
124-
"karma-webpack": "4.0.2",
120+
"karma-webpack": "5.0.0",
125121
"lint-staged": "^10.5.4",
126122
"mocha": "^8.3.0",
127123
"prettier": "^2.2.1",
124+
"process": "^0.11.10",
128125
"react": "^16.14.0",
129126
"react-dom": "^16.14.0",
130127
"react-transition-group": "^4.4.1",
131128
"rimraf": "^3.0.2",
132-
"rollup": "^2.39.1",
129+
"rollup": "^2.40.0",
133130
"simulant": "^0.2.2",
134131
"sinon": "^9.2.4",
135132
"sinon-chai": "^3.5.0",
136-
"typescript": "^4.1.5",
137-
"webpack": "^4.46.0",
138-
"webpack-atoms": "^14.0.0",
139-
"webpack-cli": "^3.3.12"
133+
"stream-browserify": "^3.0.0",
134+
"typescript": "^4.2.2",
135+
"util": "^0.12.3",
136+
"webpack": "^5.24.2",
137+
"webpack-atoms": "^16.0.1",
138+
"webpack-cli": "^4.5.0"
140139
},
141140
"bugs": {
142141
"url": "https://github.com/react-bootstrap/react-overlays/issues"
143-
},
144-
"readme": "ERROR: No README data found!",
145-
"homepage": "https://github.com/react-bootstrap/react-overlays#readme",
146-
"_id": "[email protected]"
142+
}
147143
}

‎src/Dropdown.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ function useRefWithUpdate() {
112112

113113
/**
114114
* @displayName Dropdown
115+
* @public
115116
*/
116117
function Dropdown({
117118
drop,

‎www/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,8 @@
2525
"react-dom": "^16.14.0",
2626
"react-transition-group": "^4.4.1",
2727
"sass": "^1.32.8"
28+
},
29+
"resolutions": {
30+
"ast-types": "^0.14.2"
2831
}
2932
}

‎www/yarn.lock

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2591,10 +2591,12 @@ ast-types-flow@^0.0.7:
25912591
resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
25922592
integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
25932593

2594-
ast-types@^0.13.2, ast-types@~0.13.2:
2595-
version "0.13.3"
2596-
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.3.tgz#50da3f28d17bdbc7969a3a2d83a0e4a72ae755a7"
2597-
integrity sha512-XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA==
2594+
ast-types@^0.13.2, ast-types@^0.14.2, ast-types@~0.13.2:
2595+
version "0.14.2"
2596+
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.14.2.tgz#600b882df8583e3cd4f2df5fa20fa83759d4bdfd"
2597+
integrity sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==
2598+
dependencies:
2599+
tslib "^2.0.1"
25982600

25992601
astral-regex@^1.0.0:
26002602
version "1.0.0"
@@ -13529,6 +13531,11 @@ tslib@^2.0.0, tslib@~2.0.1:
1352913531
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
1353013532
integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==
1353113533

13534+
tslib@^2.0.1:
13535+
version "2.1.0"
13536+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
13537+
integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
13538+
1353213539
tsutils@^3.17.1:
1353313540
version "3.17.1"
1353413541
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"

0 commit comments

Comments
 (0)