Skip to content

Commit 72daed2

Browse files
Merge branch 'master' into shareable-fixes
2 parents 8376cee + f48497b commit 72daed2

File tree

132 files changed

+4032
-3044
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+4032
-3044
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
/x-pack/test/functional/services/ml.ts @elastic/ml-ui
4545
# ML team owns the transform plugin, ES team added here for visibility
4646
# because the plugin lives in Kibana's Elasticsearch management section.
47-
/x-pack/legacy/plugins/transform/ @elastic/ml-ui @elastic/es-ui
47+
/x-pack/legacy/plugins/transform/ @elastic/ml-ui @elastic/es-ui
4848

4949
# Operations
5050
/renovate.json5 @elastic/kibana-operations
@@ -68,7 +68,9 @@
6868
# Security
6969
/x-pack/legacy/plugins/security/ @elastic/kibana-security
7070
/x-pack/legacy/plugins/spaces/ @elastic/kibana-security
71+
/x-pack/plugins/spaces/ @elastic/kibana-security
7172
/x-pack/legacy/plugins/encrypted_saved_objects/ @elastic/kibana-security
73+
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
7274
/src/legacy/server/csp/ @elastic/kibana-security
7375
/x-pack/plugins/security/ @elastic/kibana-security
7476
/x-pack/test/api_integration/apis/security/ @elastic/kibana-security

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
"reselect": "^3.0.1",
234234
"resize-observer-polyfill": "^1.5.0",
235235
"rison-node": "1.0.2",
236-
"rxjs": "^6.2.1",
236+
"rxjs": "^6.5.3",
237237
"script-loader": "0.7.2",
238238
"semver": "^5.5.0",
239239
"style-it": "^2.1.3",

packages/kbn-dev-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"exit-hook": "^2.2.0",
1717
"getopts": "^2.2.5",
1818
"moment": "^2.24.0",
19-
"rxjs": "^6.2.1",
19+
"rxjs": "^6.5.3",
2020
"tree-kill": "^1.2.1",
2121
"tslib": "^1.9.3"
2222
},

packages/kbn-dev-utils/src/proc_runner/proc.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ export function startProc(name: string, options: ProcOptions, log: ToolingLog) {
100100

101101
const outcome$: Rx.Observable<number | null> = Rx.race(
102102
// observe first exit event
103-
Rx.fromEvent(childProcess, 'exit').pipe(
103+
Rx.fromEvent<[number]>(childProcess, 'exit').pipe(
104104
take(1),
105-
map(([code]: [number]) => {
105+
map(([code]) => {
106106
if (stopCalled) {
107107
return null;
108108
}

packages/kbn-pm/dist/index.js

Lines changed: 2410 additions & 2320 deletions
Large diffs are not rendered by default.

packages/kbn-pm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"ora": "^1.4.0",
5353
"prettier": "^1.18.2",
5454
"read-pkg": "^5.2.0",
55-
"rxjs": "^6.2.1",
55+
"rxjs": "^6.5.3",
5656
"spawn-sync": "^1.0.15",
5757
"string-replace-loader": "^2.2.0",
5858
"strip-ansi": "^4.0.0",

packages/kbn-test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"glob": "^7.1.2",
2626
"parse-link-header": "^1.0.1",
2727
"strip-ansi": "^5.2.0",
28-
"rxjs": "^6.2.1",
28+
"rxjs": "^6.5.3",
2929
"tar-fs": "^1.16.3",
3030
"tmp": "^0.1.0",
3131
"xml2js": "^0.4.22",

src/core/public/chrome/ui/header/header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ interface Props {
171171
navLinks$: Rx.Observable<ChromeNavLink[]>;
172172
recentlyAccessed$: Rx.Observable<ChromeRecentlyAccessedHistoryItem[]>;
173173
forceAppSwitcherNavigation$: Rx.Observable<boolean>;
174-
helpExtension$: Rx.Observable<ChromeHelpExtension>;
174+
helpExtension$: Rx.Observable<ChromeHelpExtension | undefined>;
175175
legacyMode: boolean;
176176
navControlsLeft$: Rx.Observable<readonly ChromeNavControl[]>;
177177
navControlsRight$: Rx.Observable<readonly ChromeNavControl[]>;

src/core/public/chrome/ui/header/header_help_menu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import { HeaderExtension } from './header_extension';
4343
import { ChromeHelpExtension } from '../../chrome_service';
4444

4545
interface Props {
46-
helpExtension$: Rx.Observable<ChromeHelpExtension>;
46+
helpExtension$: Rx.Observable<ChromeHelpExtension | undefined>;
4747
intl: InjectedIntl;
4848
kibanaVersion: string;
4949
useDefaultContent?: boolean;

src/core/server/legacy/plugins/find_legacy_plugin_specs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export async function findLegacyPluginSpecs(settings: unknown, loggerFactory: Lo
5454
invalidDirectoryError$: Observable<{ path: string }>;
5555
invalidPackError$: Observable<{ path: string }>;
5656
otherError$: Observable<unknown>;
57-
deprecation$: Observable<unknown>;
57+
deprecation$: Observable<{ spec: LegacyPluginSpec; message: string }>;
5858
invalidVersionSpec$: Observable<LegacyPluginSpec>;
5959
spec$: Observable<LegacyPluginSpec>;
6060
disabledSpec$: Observable<LegacyPluginSpec>;

0 commit comments

Comments
 (0)