mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
(cherry picked from commit 36c614ab0b
)
# Conflicts:
# package.json
This commit is contained in:
parent
2a69f8a36b
commit
98fa4a6513
3 changed files with 17 additions and 13 deletions
|
@ -85,7 +85,7 @@
|
|||
"**/isomorphic-fetch/node-fetch": "^2.6.7",
|
||||
"**/istanbul-lib-coverage": "^3.2.0",
|
||||
"**/json-schema": "^0.4.0",
|
||||
"**/minimist": "^1.2.5",
|
||||
"**/minimist": "^1.2.6",
|
||||
"**/node-forge": "^1.2.1",
|
||||
"**/pdfkit/crypto-js": "4.0.0",
|
||||
"**/react-syntax-highlighter": "^15.3.1",
|
||||
|
@ -633,7 +633,7 @@
|
|||
"@types/mime": "^2.0.1",
|
||||
"@types/mime-types": "^2.1.0",
|
||||
"@types/minimatch": "^2.0.29",
|
||||
"@types/minimist": "^1.2.1",
|
||||
"@types/minimist": "^1.2.2",
|
||||
"@types/mocha": "^9.1.0",
|
||||
"@types/mock-fs": "^4.13.1",
|
||||
"@types/moment-timezone": "^0.5.12",
|
||||
|
@ -827,7 +827,7 @@
|
|||
"lmdb-store": "^1.6.11",
|
||||
"marge": "^1.0.1",
|
||||
"micromatch": "3.1.10",
|
||||
"minimist": "^1.2.5",
|
||||
"minimist": "^1.2.6",
|
||||
"mkdirp": "0.5.1",
|
||||
"mocha": "^9.1.0",
|
||||
"mocha-junit-reporter": "^2.0.2",
|
||||
|
|
8
packages/kbn-pm/dist/index.js
vendored
8
packages/kbn-pm/dist/index.js
vendored
|
@ -16437,7 +16437,7 @@ module.exports = function (args, opts) {
|
|||
var o = obj;
|
||||
for (var i = 0; i < keys.length-1; i++) {
|
||||
var key = keys[i];
|
||||
if (key === '__proto__') return;
|
||||
if (isConstructorOrProto(o, key)) return;
|
||||
if (o[key] === undefined) o[key] = {};
|
||||
if (o[key] === Object.prototype || o[key] === Number.prototype
|
||||
|| o[key] === String.prototype) o[key] = {};
|
||||
|
@ -16446,7 +16446,7 @@ module.exports = function (args, opts) {
|
|||
}
|
||||
|
||||
var key = keys[keys.length - 1];
|
||||
if (key === '__proto__') return;
|
||||
if (isConstructorOrProto(o, key)) return;
|
||||
if (o === Object.prototype || o === Number.prototype
|
||||
|| o === String.prototype) o = {};
|
||||
if (o === Array.prototype) o = [];
|
||||
|
@ -16611,6 +16611,10 @@ function isNumber (x) {
|
|||
}
|
||||
|
||||
|
||||
function isConstructorOrProto (obj, key) {
|
||||
return key === 'constructor' && typeof obj[key] === 'function' || key === '__proto__';
|
||||
}
|
||||
|
||||
|
||||
/***/ }),
|
||||
/* 229 */
|
||||
|
|
16
yarn.lock
16
yarn.lock
|
@ -6208,10 +6208,10 @@
|
|||
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-2.0.29.tgz#5002e14f75e2d71e564281df0431c8c1b4a2a36a"
|
||||
integrity sha1-UALhT3Xi1x5WQoHfBDHIwbSio2o=
|
||||
|
||||
"@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/minimist@^1.2.0", "@types/minimist@^1.2.2":
|
||||
version "1.2.2"
|
||||
resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
|
||||
integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
|
||||
|
||||
"@types/minipass@*":
|
||||
version "2.2.0"
|
||||
|
@ -19995,10 +19995,10 @@ minimist-options@4.1.0, minimist-options@^4.0.2:
|
|||
is-plain-obj "^1.1.0"
|
||||
kind-of "^6.0.3"
|
||||
|
||||
minimist@0.0.8, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@~1.2.0:
|
||||
version "1.2.5"
|
||||
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
|
||||
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
|
||||
minimist@0.0.8, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6, minimist@~1.2.0:
|
||||
version "1.2.6"
|
||||
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
|
||||
integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
|
||||
|
||||
minipass-collect@^1.0.2:
|
||||
version "1.0.2"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue