Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup package.json resolutions. #99456

Merged
merged 10 commits into from
May 19, 2021
Merged

Cleanup package.json resolutions. #99456

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b17423e
Cleanup package.json resolutions.
azasypkin May 6, 2021
19f8cce
Merge branch 'master' into issue-xxx-update-resolutions
azasypkin May 6, 2021
90dfa8f
Review#1: handle feedback.
azasypkin May 6, 2021
bc972b9
Adjust `stat` and `setTimeout` return types.
azasypkin May 6, 2021
7047f0d
Merge branch 'master' into issue-xxx-update-resolutions
azasypkin May 10, 2021
2028a99
Resolve conflicts with master.
azasypkin May 10, 2021
68d6c14
Merge branch 'master' into issue-xxx-update-resolutions
azasypkin May 14, 2021
60fef9c
Merge branch 'master' into issue-xxx-update-resolutions
azasypkin May 18, 2021
3d94a85
Merge branch 'master' into issue-xxx-update-resolutions
azasypkin May 19, 2021
1da67ea
Merge branch 'master' into issue-xxx-update-resolutions
kibanamachine May 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,8 @@
"url": "https://github.com/elastic/kibana.git"
},
"resolutions": {
"**/@types/node": "14.14.14",
"**/@types/node": "14.14.44",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should update our own reference in the package.json file as well

"**/chokidar": "^3.4.3",
"**/cross-fetch/node-fetch": "^2.6.1",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: we don't have any package that depends on cross-fetch right now.

"**/deepmerge": "^4.2.2",
"**/fast-deep-equal": "^3.1.1",
"globby/fast-glob": "3.2.5",
Expand All @@ -87,7 +86,7 @@
"**/react-syntax-highlighter": "^15.3.1",
"**/react-syntax-highlighter/**/highlight.js": "^10.4.1",
"**/request": "^2.88.2",
"**/trim": "0.0.3",
"**/trim": "1.0.1",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: really, nothing to worry about, just moved to a proper semver.

"**/typescript": "4.1.3",
"**/underscore": "^1.13.1"
},
Expand Down Expand Up @@ -329,7 +328,6 @@
"react-ace": "^5.9.0",
"react-beautiful-dnd": "^13.0.0",
"react-color": "^2.13.8",
"react-datetime": "^2.14.0",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: it's not used anywhere

"react-dom": "^16.12.0",
"react-dropzone": "^4.2.9",
"react-fast-compare": "^2.0.4",
Expand Down Expand Up @@ -568,13 +566,14 @@
"@types/mime": "^2.0.1",
"@types/mime-types": "^2.1.0",
"@types/minimatch": "^2.0.29",
"@types/minimist": "^1.2.1",
"@types/mocha": "^8.2.0",
"@types/mock-fs": "^4.10.0",
"@types/moment-timezone": "^0.5.12",
"@types/mustache": "^0.8.31",
"@types/ncp": "^2.0.1",
"@types/nock": "^10.0.3",
"@types/node": "14.14.14",
"@types/node": "14.14.44",
"@types/node-fetch": "^2.5.7",
"@types/node-forge": "^0.9.5",
"@types/nodemailer": "^6.4.0",
Expand Down
4 changes: 2 additions & 2 deletions src/core/server/plugins/discovery/scan_plugin_search_paths.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
* Side Public License, v 1.
*/

import { readdir, stat } from 'fs';
import { PathLike, readdir, stat, Stats } from 'fs';
import { resolve } from 'path';
import { bindNodeCallback, from, Observable } from 'rxjs';
import { catchError, mergeMap } from 'rxjs/operators';
import { Logger } from '../../logging';
import { PluginDiscoveryError } from './plugin_discovery_error';

const fsReadDir$ = bindNodeCallback<string, string[]>(readdir);
const fsStat$ = bindNodeCallback(stat);
const fsStat$ = bindNodeCallback<PathLike, Stats>(stat);

const maxScanDepth = 5;

Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/canvas/shareable_runtime/components/canvas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ export const CanvasComponent = ({
// any point, or change the interval, we need to make sure the interval is
// killed on React re-render-- otherwise the pages will start bouncing around
// as timeouts are accumulated.
clearTimeout(timeout);
window.clearTimeout(timeout);

timeout = setTimeout(
timeout = window.setTimeout(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what caused the need for this change?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's because of NodeJS typings update that might have (finally) made setTimeout related types stricter. We don't yet clearly separate environments for TS compiler to know that this setTimeout is supposed to be provided by the browser and TS assumes that it's a NodeJS one. NodeJS setTimeout is a different API with a different return type (NodeJS.Timeout instead of number) than what browsers provide.

() => onSetPage(page >= workpad.pages.length - 1 ? 0 : page + 1),
getTimeInterval(autoplay.interval)
);
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/security_solution/scripts/endpoint/trusted_apps/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* 2.0.
*/

// @ts-ignore
import minimist from 'minimist';
import { ToolingLog } from '@kbn/dev-utils';
import { KbnClient } from '@kbn/test';
Expand Down
39 changes: 12 additions & 27 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5405,10 +5405,10 @@
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-2.0.29.tgz#5002e14f75e2d71e564281df0431c8c1b4a2a36a"
integrity sha1-UALhT3Xi1x5WQoHfBDHIwbSio2o=

"@types/minimist@^1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
"@types/minimist@^1.2.0", "@types/minimist@^1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==

"@types/minipass@*":
version "2.2.0"
Expand Down Expand Up @@ -5477,10 +5477,10 @@
dependencies:
"@types/node" "*"

"@types/node@*", "@types/[email protected]", "@types/[email protected].14", "@types/[email protected]", "@types/node@>= 8", "@types/node@>=8.9.0", "@types/node@^10.1.0":
version "14.14.14"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz#f7fd5f3cc8521301119f63910f0fb965c7d761ae"
integrity sha512-UHnOPWVWV1z+VV8k6L1HhG7UbGBgIdghqF3l9Ny9ApPghbjICXkUJSd/b9gOgQfjM1r+37cipdw/HJ3F6ICEnQ==
"@types/node@*", "@types/[email protected]", "@types/[email protected].44", "@types/[email protected]", "@types/node@>= 8", "@types/node@>=8.9.0", "@types/node@^10.1.0":
version "14.14.44"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz#df7503e6002847b834371c004b372529f3f85215"
integrity sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA==

"@types/nodemailer@^6.4.0":
version "6.4.0"
Expand Down Expand Up @@ -22779,16 +22779,6 @@ react-color@^2.13.8, react-color@^2.17.0:
reactcss "^1.2.0"
tinycolor2 "^1.4.1"

react-datetime@^2.14.0:
version "2.15.0"
resolved "https://registry.yarnpkg.com/react-datetime/-/react-datetime-2.15.0.tgz#a8f7da6c58b6b45dbeea32d4e8485db17614e12c"
integrity sha512-RP5OqXVfrhdoFALJzMU8tKxRFaIZzJZqZEpf5oK7pvwG80a/bET/TdJ7jT7W9lyAf1nKNo6zyYkvHW3ZJ/ypvg==
dependencies:
create-react-class "^15.5.2"
object-assign "^3.0.0"
prop-types "^15.5.7"
react-onclickoutside "^6.5.0"

react-dev-utils@^11.0.3:
version "11.0.4"
resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-11.0.4.tgz#a7ccb60257a1ca2e0efe7a83e38e6700d17aa37a"
Expand Down Expand Up @@ -23074,11 +23064,6 @@ react-motion@^0.4.8:
prop-types "^15.5.8"
raf "^3.1.0"

react-onclickoutside@^6.5.0:
version "6.7.1"
resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.7.1.tgz#6a5b5b8b4eae6b776259712c89c8a2b36b17be93"
integrity sha512-p84kBqGaMoa7VYT0vZ/aOYRfJB+gw34yjpda1Z5KeLflg70HipZOT+MXQenEhdkPAABuE2Astq4zEPdMqUQxcg==

react-popper-tooltip@^2.10.1:
version "2.11.1"
resolved "https://registry.yarnpkg.com/react-popper-tooltip/-/react-popper-tooltip-2.11.1.tgz#3c4bdfd8bc10d1c2b9a162e859bab8958f5b2644"
Expand Down Expand Up @@ -27162,10 +27147,10 @@ trim-trailing-lines@^1.0.0:
resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz#7aefbb7808df9d669f6da2e438cac8c46ada7684"
integrity sha1-eu+7eAjfnWafbaLkOMrIxGradoQ=

[email protected], trim@0.0.3:
version "0.0.3"
resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.3.tgz#05243a47a3a4113e6b49367880a9cca59697a20b"
integrity sha512-h82ywcYhHK7veeelXrCScdH7HkWfbIT1D/CgYO+nmDarz3SGNssVBMws6jU16Ga60AJCRAvPV6w6RLuNerQqjg==
[email protected], trim@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/trim/-/trim-1.0.1.tgz#68e78f6178ccab9687a610752f4f5e5a7022ee8c"
integrity sha512-3JVP2YVqITUisXblCDq/Bi4P9457G/sdEamInkyvCsjbTcXLXIiG7XCb4kGMFWh6JGXesS3TKxOPtrncN/xe8w==

triple-beam@^1.2.0, triple-beam@^1.3.0:
version "1.3.0"
Expand Down