Skip to content

Commit 9a8bb6f

Browse files
Merge branch 'master' into canvas-notify-service
2 parents bd34f47 + 66074f9 commit 9a8bb6f

File tree

359 files changed

+5209
-6919
lines changed

Some content is hidden

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

359 files changed

+5209
-6919
lines changed

.eslintrc.js

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -185,31 +185,40 @@ module.exports = {
185185
zones: [
186186
{
187187
target: [
188-
'src/legacy/**/*',
189-
'x-pack/**/*',
190-
'!x-pack/**/*.test.*',
191-
'!x-pack/test/**/*',
188+
'(src|x-pack)/legacy/**/*',
192189
'(src|x-pack)/plugins/**/(public|server)/**/*',
193-
'src/core/(public|server)/**/*',
194190
'examples/**/*',
195191
],
196192
from: [
197193
'src/core/public/**/*',
198-
'!src/core/public/index.ts',
199-
'!src/core/public/mocks.ts',
200-
'!src/core/public/*.test.mocks.ts',
194+
'!src/core/public/index.ts', // relative import
195+
'!src/core/public/mocks{,.ts}',
196+
'!src/core/server/types{,.ts}',
201197
'!src/core/public/utils/**/*',
198+
'!src/core/public/*.test.mocks{,.ts}',
202199

203200
'src/core/server/**/*',
204-
'!src/core/server/index.ts',
205-
'!src/core/server/mocks.ts',
206-
'!src/core/server/types.ts',
207-
'!src/core/server/test_utils.ts',
201+
'!src/core/server/index.ts', // relative import
202+
'!src/core/server/mocks{,.ts}',
203+
'!src/core/server/types{,.ts}',
204+
'!src/core/server/test_utils',
208205
// for absolute imports until fixed in
209206
// https://github.com/elastic/kibana/issues/36096
210-
'!src/core/server/types',
211-
'!src/core/server/*.test.mocks.ts',
212-
207+
'!src/core/server/*.test.mocks{,.ts}',
208+
],
209+
allowSameFolder: true,
210+
errorMessage:
211+
'Plugins may only import from top-level public and server modules in core.',
212+
},
213+
{
214+
target: [
215+
'(src|x-pack)/legacy/**/*',
216+
'(src|x-pack)/plugins/**/(public|server)/**/*',
217+
'examples/**/*',
218+
'!(src|x-pack)/**/*.test.*',
219+
'!(x-pack/)?test/**/*',
220+
],
221+
from: [
213222
'(src|x-pack)/plugins/**/(public|server)/**/*',
214223
'!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,ts,tsx}',
215224
],

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
/src/plugins/vis_type_timelion/ @elastic/kibana-app
1919
/src/plugins/dashboard/ @elastic/kibana-app
2020
/src/plugins/discover/ @elastic/kibana-app
21+
/src/plugins/input_control_vis/ @elastic/kibana-app
2122
/src/plugins/visualize/ @elastic/kibana-app
2223
/src/plugins/vis_type_timeseries/ @elastic/kibana-app
2324
/src/plugins/vis_type_metric/ @elastic/kibana-app

.i18nrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"esUi": "src/plugins/es_ui_shared",
1515
"devTools": "src/plugins/dev_tools",
1616
"expressions": "src/plugins/expressions",
17-
"inputControl": "src/legacy/core_plugins/input_control_vis",
17+
"inputControl": "src/plugins/input_control_vis",
1818
"inspector": "src/plugins/inspector",
1919
"inspectorViews": "src/legacy/core_plugins/inspector_views",
2020
"interpreter": "src/legacy/core_plugins/interpreter",

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.baseformatterspublic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
<b>Signature:</b>
88

99
```typescript
10-
baseFormattersPublic: (import("../../common").IFieldFormatType | typeof DateFormat)[]
10+
baseFormattersPublic: (import("../../common").FieldFormatInstanceType | typeof DateFormat)[]
1111
```

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
```typescript
1010
setup(core: CoreSetup, { usageCollection }: DataPluginSetupDependencies): {
1111
fieldFormats: {
12-
register: (customFieldFormat: import("../common").IFieldFormatType) => number;
12+
register: (customFieldFormat: import("../common").FieldFormatInstanceType) => number;
1313
};
1414
search: ISearchSetup;
1515
};
@@ -26,7 +26,7 @@ setup(core: CoreSetup, { usageCollection }: DataPluginSetupDependencies): {
2626

2727
`{
2828
fieldFormats: {
29-
register: (customFieldFormat: import("../common").IFieldFormatType) => number;
29+
register: (customFieldFormat: import("../common").FieldFormatInstanceType) => number;
3030
};
3131
search: ISearchSetup;
3232
}`

packages/kbn-babel-preset/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"babel-plugin-add-module-exports": "^1.0.2",
1616
"babel-plugin-filter-imports": "^3.0.0",
1717
"babel-plugin-styled-components": "^1.10.6",
18-
"babel-plugin-transform-define": "^1.3.1"
18+
"babel-plugin-transform-define": "^1.3.1",
19+
"babel-plugin-transform-imports": "^2.0.0"
1920
}
2021
}

packages/kbn-babel-preset/webpack_preset.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,24 @@ module.exports = () => {
4242
},
4343
],
4444
],
45+
// NOTE: we can enable this by default for everything as soon as we only have one instance
46+
// of lodash across the entire project. For now we are just enabling it for siem
47+
// as they are extensively using the lodash v4
48+
overrides: [
49+
{
50+
test: [/x-pack[\/\\]legacy[\/\\]plugins[\/\\]siem[\/\\]public/],
51+
plugins: [
52+
[
53+
require.resolve('babel-plugin-transform-imports'),
54+
{
55+
'lodash/?(((\\w*)?/?)*)': {
56+
transform: 'lodash/${1}/${member}',
57+
preventFullImport: false,
58+
},
59+
},
60+
],
61+
],
62+
},
63+
],
4564
};
4665
};

src/core/public/http/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@
1818
*/
1919

2020
export { HttpService } from './http_service';
21+
export { HttpFetchError } from './http_fetch_error';
2122
export * from './types';

src/core/public/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ export {
143143
export {
144144
HttpHeadersInit,
145145
HttpRequestInit,
146+
HttpFetchError,
146147
HttpFetchOptions,
147148
HttpFetchOptionsWithPath,
148149
HttpFetchQuery,

src/core/public/public.api.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,23 @@ export type HandlerFunction<T extends object> = (context: T, ...args: any[]) =>
593593
// @public
594594
export type HandlerParameters<T extends HandlerFunction<any>> = T extends (context: any, ...args: infer U) => any ? U : never;
595595

596+
// @internal (undocumented)
597+
export class HttpFetchError extends Error implements IHttpFetchError {
598+
constructor(message: string, name: string, request: Request, response?: Response | undefined, body?: any);
599+
// (undocumented)
600+
readonly body?: any;
601+
// (undocumented)
602+
readonly name: string;
603+
// (undocumented)
604+
readonly req: Request;
605+
// (undocumented)
606+
readonly request: Request;
607+
// (undocumented)
608+
readonly res?: Response;
609+
// (undocumented)
610+
readonly response?: Response | undefined;
611+
}
612+
596613
// @public
597614
export interface HttpFetchOptions extends HttpRequestInit {
598615
asResponse?: boolean;

0 commit comments

Comments
 (0)