Skip to content

Commit

Permalink
Merge branch 'main' into fix/ftr-better-kibana-early-exit-handling
Browse files Browse the repository at this point in the history
  • Loading branch information
Spencer authored May 9, 2022
2 parents da5d5af + a8017df commit d37fe3b
Show file tree
Hide file tree
Showing 87 changed files with 1,765 additions and 399 deletions.
14 changes: 0 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,7 @@
"https-proxy-agent": "^5.0.0",
"i18n-iso-countries": "^4.3.1",
"icalendar": "0.7.1",
"idx": "^2.5.6",
"immer": "^9.0.6",
"inline-style": "^2.0.0",
"inquirer": "^7.3.3",
"intl": "^1.2.5",
"intl-format-cache": "^2.1.0",
Expand Down Expand Up @@ -415,7 +413,6 @@
"styled-components": "^5.1.0",
"suricata-sid-db": "^1.0.2",
"symbol-observable": "^1.2.0",
"tabbable": "1.1.3",
"tar": "^6.1.11",
"tinycolor2": "1.4.1",
"tinygradient": "0.4.3",
Expand All @@ -438,7 +435,6 @@
"vega-tooltip": "^0.28.0",
"venn.js": "0.2.20",
"vinyl": "^2.2.0",
"vt-pbf": "^3.1.1",
"whatwg-fetch": "^3.0.0",
"xml2js": "^0.4.22",
"yauzl": "^2.10.0"
Expand Down Expand Up @@ -715,7 +711,6 @@
"@types/opn": "^5.1.0",
"@types/ora": "^1.3.5",
"@types/papaparse": "^5.0.3",
"@types/parse-link-header": "^1.0.0",
"@types/pbf": "3.0.2",
"@types/pdfmake": "^0.1.19",
"@types/pegjs": "^0.10.1",
Expand Down Expand Up @@ -757,7 +752,6 @@
"@types/supertest": "^2.0.5",
"@types/tapable": "^1.0.6",
"@types/tar": "^4.0.5",
"@types/tar-fs": "^1.16.1",
"@types/tempy": "^0.2.0",
"@types/testing-library__jest-dom": "^5.14.3",
"@types/tinycolor2": "^1.4.1",
Expand Down Expand Up @@ -854,7 +848,6 @@
"file-loader": "^4.2.0",
"form-data": "^4.0.0",
"geckodriver": "^3.0.1",
"glob-watcher": "5.0.3",
"gulp": "4.0.2",
"gulp-babel": "^8.0.0",
"gulp-brotli": "^3.0.0",
Expand Down Expand Up @@ -894,13 +887,11 @@
"marge": "^1.0.1",
"micromatch": "3.1.10",
"minimist": "^1.2.6",
"mkdirp": "0.5.1",
"mocha": "^9.1.0",
"mocha-junit-reporter": "^2.0.2",
"mochawesome": "^7.0.1",
"mochawesome-merge": "^4.2.1",
"mock-fs": "^5.1.2",
"mock-http-server": "1.3.0",
"ms-chromium-edge-driver": "^0.5.1",
"multimatch": "^4.0.0",
"mutation-observer": "^1.0.3",
Expand All @@ -910,10 +901,8 @@
"nyc": "^15.1.0",
"oboe": "^2.1.4",
"openapi-types": "^10.0.0",
"parse-link-header": "^1.0.1",
"pbf": "3.2.1",
"pirates": "^4.0.1",
"pixelmatch": "^5.1.0",
"playwright": "^1.17.1",
"postcss": "^7.0.32",
"postcss-loader": "^3.0.0",
Expand All @@ -927,9 +916,7 @@
"resolve": "^1.22.0",
"rxjs-marbles": "^5.0.6",
"sass-loader": "^10.2.0",
"sass-resources-loader": "^2.0.1",
"selenium-webdriver": "^4.1.1",
"serve-static": "1.14.1",
"shelljs": "^0.8.4",
"simple-git": "1.116.0",
"sinon": "^7.4.2",
Expand All @@ -945,7 +932,6 @@
"supertest": "^3.1.0",
"supports-color": "^7.0.0",
"tape": "^5.0.1",
"tar-fs": "^2.1.0",
"tempy": "^0.3.0",
"terser": "^5.7.1",
"terser-webpack-plugin": "^4.2.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-optimizer/limits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pageLoadAssetSize:
telemetry: 51957
telemetryManagementSection: 38586
transform: 41007
triggersActionsUi: 103400
triggersActionsUi: 104400
upgradeAssistant: 81241
urlForwarding: 32579
usageCollection: 39762
Expand Down
214 changes: 107 additions & 107 deletions packages/kbn-pm/dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19305,7 +19305,7 @@ cmdShim.ifExists = cmdShimIfExists

var fs = __webpack_require__("../../node_modules/graceful-fs/graceful-fs.js")

var mkdir = __webpack_require__("../../node_modules/cmd-shim/node_modules/mkdirp/index.js")
var mkdir = __webpack_require__("../../node_modules/mkdirp/index.js")
, path = __webpack_require__("path")
, toBatchSyntax = __webpack_require__("../../node_modules/cmd-shim/lib/to-batch-syntax.js")
, shebangExpr = /^#\!\s*(?:\/usr\/bin\/env)?\s*([^ \t]+=[^ \t]+\s+)*\s*([^ \t]+)(.*)$/
Expand Down Expand Up @@ -19598,112 +19598,6 @@ function replaceDollarWithPercentPair(value) {



/***/ }),

/***/ "../../node_modules/cmd-shim/node_modules/mkdirp/index.js":
/***/ (function(module, exports, __webpack_require__) {

var path = __webpack_require__("path");
var fs = __webpack_require__("fs");
var _0777 = parseInt('0777', 8);

module.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP;

function mkdirP (p, opts, f, made) {
if (typeof opts === 'function') {
f = opts;
opts = {};
}
else if (!opts || typeof opts !== 'object') {
opts = { mode: opts };
}

var mode = opts.mode;
var xfs = opts.fs || fs;

if (mode === undefined) {
mode = _0777 & (~process.umask());
}
if (!made) made = null;

var cb = f || function () {};
p = path.resolve(p);

xfs.mkdir(p, mode, function (er) {
if (!er) {
made = made || p;
return cb(null, made);
}
switch (er.code) {
case 'ENOENT':
if (path.dirname(p) === p) return cb(er);
mkdirP(path.dirname(p), opts, function (er, made) {
if (er) cb(er, made);
else mkdirP(p, opts, cb, made);
});
break;

// In the case of any other error, just see if there's a dir
// there already. If so, then hooray! If not, then something
// is borked.
default:
xfs.stat(p, function (er2, stat) {
// if the stat fails, then that's super weird.
// let the original error be the failure reason.
if (er2 || !stat.isDirectory()) cb(er, made)
else cb(null, made);
});
break;
}
});
}

mkdirP.sync = function sync (p, opts, made) {
if (!opts || typeof opts !== 'object') {
opts = { mode: opts };
}

var mode = opts.mode;
var xfs = opts.fs || fs;

if (mode === undefined) {
mode = _0777 & (~process.umask());
}
if (!made) made = null;

p = path.resolve(p);

try {
xfs.mkdirSync(p, mode);
made = made || p;
}
catch (err0) {
switch (err0.code) {
case 'ENOENT' :
made = sync(path.dirname(p), opts, made);
sync(p, opts, made);
break;

// In the case of any other error, just see if there's a dir
// there already. If so, then hooray! If not, then something
// is borked.
default:
var stat;
try {
stat = xfs.statSync(p);
}
catch (err1) {
throw err0;
}
if (!stat.isDirectory()) throw err0;
break;
}
}

return made;
};


/***/ }),

/***/ "../../node_modules/color-convert/conversions.js":
Expand Down Expand Up @@ -36304,6 +36198,112 @@ function isConstructorOrProto (obj, key) {
}


/***/ }),

/***/ "../../node_modules/mkdirp/index.js":
/***/ (function(module, exports, __webpack_require__) {

var path = __webpack_require__("path");
var fs = __webpack_require__("fs");
var _0777 = parseInt('0777', 8);

module.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP;

function mkdirP (p, opts, f, made) {
if (typeof opts === 'function') {
f = opts;
opts = {};
}
else if (!opts || typeof opts !== 'object') {
opts = { mode: opts };
}

var mode = opts.mode;
var xfs = opts.fs || fs;

if (mode === undefined) {
mode = _0777 & (~process.umask());
}
if (!made) made = null;

var cb = f || function () {};
p = path.resolve(p);

xfs.mkdir(p, mode, function (er) {
if (!er) {
made = made || p;
return cb(null, made);
}
switch (er.code) {
case 'ENOENT':
if (path.dirname(p) === p) return cb(er);
mkdirP(path.dirname(p), opts, function (er, made) {
if (er) cb(er, made);
else mkdirP(p, opts, cb, made);
});
break;

// In the case of any other error, just see if there's a dir
// there already. If so, then hooray! If not, then something
// is borked.
default:
xfs.stat(p, function (er2, stat) {
// if the stat fails, then that's super weird.
// let the original error be the failure reason.
if (er2 || !stat.isDirectory()) cb(er, made)
else cb(null, made);
});
break;
}
});
}

mkdirP.sync = function sync (p, opts, made) {
if (!opts || typeof opts !== 'object') {
opts = { mode: opts };
}

var mode = opts.mode;
var xfs = opts.fs || fs;

if (mode === undefined) {
mode = _0777 & (~process.umask());
}
if (!made) made = null;

p = path.resolve(p);

try {
xfs.mkdirSync(p, mode);
made = made || p;
}
catch (err0) {
switch (err0.code) {
case 'ENOENT' :
made = sync(path.dirname(p), opts, made);
sync(p, opts, made);
break;

// In the case of any other error, just see if there's a dir
// there already. If so, then hooray! If not, then something
// is borked.
default:
var stat;
try {
stat = xfs.statSync(p);
}
catch (err1) {
throw err0;
}
if (!stat.isDirectory()) throw err0;
break;
}
}

return made;
};


/***/ }),

/***/ "../../node_modules/multimatch/index.js":
Expand Down
2 changes: 0 additions & 2 deletions packages/kbn-test-jest-helpers/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ RUNTIME_DEPS = [
"@npm//joi",
"@npm//mustache",
"@npm//normalize-path",
"@npm//parse-link-header",
"@npm//prettier",
"@npm//react",
"@npm//react-dom",
Expand Down Expand Up @@ -106,7 +105,6 @@ TYPES_DEPS = [
"@npm//@types/mustache",
"@npm//@types/normalize-path",
"@npm//@types/node",
"@npm//@types/parse-link-header",
"@npm//@types/prettier",
"@npm//@types/react",
"@npm//@types/react-dom",
Expand Down
2 changes: 0 additions & 2 deletions packages/kbn-test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ RUNTIME_DEPS = [
"@npm//js-yaml",
"@npm//mustache",
"@npm//normalize-path",
"@npm//parse-link-header",
"@npm//prettier",
"@npm//react-dom",
"@npm//react-redux",
Expand Down Expand Up @@ -115,7 +114,6 @@ TYPES_DEPS = [
"@npm//@types/mustache",
"@npm//@types/normalize-path",
"@npm//@types/node",
"@npm//@types/parse-link-header",
"@npm//@types/prettier",
"@npm//@types/react-dom",
"@npm//@types/react-redux",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,9 @@ function DiscoverDocumentsComponent({
</>
)}
{!isLegacy && (
<div className="dscDiscoverGrid">
<>
<DocumentExplorerUpdateCallout />
<>
<DocumentExplorerUpdateCallout />
<div className="dscDiscoverGrid">
<DataGridMemoized
ariaLabelledBy="documentsAriaLabel"
columns={columns}
Expand All @@ -183,8 +183,8 @@ function DiscoverDocumentsComponent({
rowHeightState={state.rowHeight}
onUpdateRowHeight={onUpdateRowHeight}
/>
</>
</div>
</div>
</>
)}
</EuiFlexItem>
);
Expand Down
Loading

0 comments on commit d37fe3b

Please sign in to comment.