Skip to content

Commit 9196ac1

Browse files
simianhackersimianhacker
committed
Merge branch 'main' of github.com:elastic/kibana into streams/_group-endpoint
2 parents 25d324e + 786df79 commit 9196ac1

200 files changed

Lines changed: 1045 additions & 659 deletions

File tree

Some content is hidden

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

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,7 +1713,7 @@
17131713
"buildkite-test-collector": "^1.7.0",
17141714
"callsites": "^3.1.0",
17151715
"chance": "1.0.18",
1716-
"chromedriver": "^132.0.0",
1716+
"chromedriver": "^133.0.0",
17171717
"clarify": "^2.2.0",
17181718
"clean-webpack-plugin": "^4.0.0",
17191719
"cli-progress": "^3.12.0",
@@ -1836,7 +1836,7 @@
18361836
"rxjs-marbles": "^7.0.1",
18371837
"sass-embedded": "^1.78.0",
18381838
"sass-loader": "^10.5.2",
1839-
"selenium-webdriver": "^4.28.0",
1839+
"selenium-webdriver": "^4.28.1",
18401840
"sharp": "0.32.6",
18411841
"simple-git": "^3.16.0",
18421842
"sinon": "^7.4.2",

‎src/platform/packages/shared/kbn-management/settings/components/field_input/code_editor.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
//
1616

1717
import React, { useCallback } from 'react';
18-
import { monaco, XJsonLang } from '@kbn/monaco';
18+
import { monaco } from '@kbn/monaco';
1919

2020
import {
2121
CodeEditor as KibanaReactCodeEditor,
2222
type CodeEditorProps as KibanaReactCodeEditorProps,
23-
MarkdownLang,
23+
MARKDOWN_LANG_ID,
24+
XJSON_LANG_ID,
2425
} from '@kbn/code-editor';
2526

2627
type Props = Pick<KibanaReactCodeEditorProps, 'aria-label' | 'value' | 'onChange'>;
@@ -103,7 +104,7 @@ export const CodeEditor = ({ onChange, type, isReadOnly, name, ...props }: CodeE
103104
return (
104105
<KibanaReactCodeEditor
105106
{...{ onChange, editorDidMount, options, ...props }}
106-
languageId={type === 'json' ? XJsonLang.ID : MarkdownLang}
107+
languageId={type === 'json' ? XJSON_LANG_ID : MARKDOWN_LANG_ID}
107108
width="100%"
108109
/>
109110
);

‎src/platform/packages/shared/kbn-monaco/index.ts‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,18 @@
99

1010
import './src/register_globals';
1111

12-
export {
13-
monaco,
14-
cssConf,
15-
cssLanguage,
16-
markdownConf,
17-
markdownLanguage,
18-
yamlConf,
19-
yamlLanguage,
20-
} from './src/monaco_imports';
21-
export { XJsonLang } from './src/xjson';
22-
export { SQLLang } from './src/sql';
23-
export { ESQL_LANG_ID, ESQL_DARK_THEME_ID, ESQL_LIGHT_THEME_ID, ESQLLang } from './src/esql';
12+
export { monaco } from './src/monaco_imports';
13+
2414
export type { ESQLCallbacks } from '@kbn/esql-validation-autocomplete';
2515

26-
export * from './src/painless';
2716
/* eslint-disable-next-line @kbn/eslint/module_migration */
2817
import * as BarePluginApi from 'monaco-editor/esm/vs/editor/editor.api';
29-
export { YAML_LANG_ID, configureMonacoYamlSchema } from './src/yaml';
3018

31-
import { registerLanguage } from './src/helpers';
19+
export * from './src/languages';
3220

33-
export { BarePluginApi, registerLanguage };
21+
export { BarePluginApi };
3422
export * from './src/types';
3523

36-
export {
37-
CONSOLE_LANG_ID,
38-
CONSOLE_OUTPUT_LANG_ID,
39-
CONSOLE_THEME_ID,
40-
getParsedRequestsProvider,
41-
ConsoleParsedRequestsProvider,
42-
createOutputParser,
43-
} from './src/console';
44-
45-
export type { ParsedRequest } from './src/console';
46-
4724
export {
4825
defaultThemesResolvers,
4926
CODE_EDITOR_DEFAULT_THEME_ID,

‎src/platform/packages/shared/kbn-monaco/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"license": "Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.0",
66
"scripts": {
7-
"build:antlr4:painless": "antlr -Dlanguage=TypeScript ./src/painless/antlr/painless_lexer.g4 ./src/painless/antlr/painless_parser.g4 && node ./scripts/fix_generated_antlr.js painless",
7+
"build:antlr4:painless": "antlr -Dlanguage=TypeScript ./src/languages/painless/antlr/painless_lexer.g4 ./src/languages/painless/antlr/painless_parser.g4 && node ./scripts/fix_generated_antlr.js painless",
88
"prebuild:antlr4": "brew bundle --file=./scripts/antlr4_tools/brewfile",
99
"build:antlr4": "yarn run build:antlr4:painless && npm run build:antlr4:esql"
1010
}

‎src/platform/packages/shared/kbn-monaco/scripts/fix_generated_antlr.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const log = ora('Updating generated antlr grammar').start();
1515
const SUPPORTED_FOLDERS = ['painless', 'esql'];
1616

1717
function execute(folder) {
18-
const generatedAntlrFolder = join(__dirname, '..', 'src', folder, 'antlr');
18+
const generatedAntlrFolder = join(__dirname, '..', 'src', 'languages', folder, 'antlr');
1919

2020
const generatedAntlrFolderContents = readdirSync(generatedAntlrFolder);
2121

‎src/platform/packages/shared/kbn-monaco/src/code_editor/constants.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
export const CODE_EDITOR_DEFAULT_THEME_ID = 'codeEditorDefaultTheme';
11-
export const CODE_EDITOR_TRANSPARENT_THEME_ID = 'codeEditorTransparentTheme';
10+
export const CODE_EDITOR_DEFAULT_THEME_ID = 'codeEditorDefaultTheme' as const;
11+
export const CODE_EDITOR_TRANSPARENT_THEME_ID = 'codeEditorTransparentTheme' as const;

‎src/platform/packages/shared/kbn-monaco/src/console/index.ts‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎src/platform/packages/shared/kbn-monaco/src/console/language.ts‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎src/platform/packages/shared/kbn-monaco/src/helpers.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@
1010
import { monaco } from './monaco_imports';
1111
import type { LangModuleType, CustomLangModuleType } from './types';
1212

13-
export function registerLanguage(language: LangModuleType | CustomLangModuleType) {
13+
export function registerLanguage(language: LangModuleType | CustomLangModuleType, force = false) {
1414
const { ID, lexerRules, languageConfiguration, foldingRangeProvider } = language;
1515

16+
if (!force && monaco.languages.getLanguages().some((lang) => lang.id === ID)) {
17+
return;
18+
}
19+
1620
monaco.languages.register({ id: ID });
1721

1822
if ('languageThemeResolver' in language) {
@@ -33,7 +37,7 @@ export function registerLanguage(language: LangModuleType | CustomLangModuleType
3337
}
3438

3539
if ('onLanguage' in language) {
36-
await language.onLanguage();
40+
await language.onLanguage?.();
3741
}
3842
});
3943
}

src/platform/packages/shared/kbn-monaco/src/console/console_errors_provider.ts renamed to src/platform/packages/shared/kbn-monaco/src/languages/console/console_errors_provider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import { ConsoleWorkerProxyService } from './console_worker_proxy';
1111
import { CONSOLE_LANG_ID } from './constants';
12-
import { monaco } from '../monaco_imports';
12+
import { monaco } from '../../monaco_imports';
1313

1414
/*
1515
* This setup function runs when the Console language is registered into the Monaco editor.

0 commit comments

Comments
 (0)