Skip to content

Commit 0f97a39

Browse files
Tyler Smalleyelasticmachine
andauthored
Disallows commonjs in new platform public (#65218) (#65547)
Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
1 parent 5826ac4 commit 0f97a39

File tree

36 files changed

+1450
-1462
lines changed

36 files changed

+1450
-1462
lines changed

.eslintrc.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,16 @@ module.exports = {
157157
},
158158
},
159159

160+
/**
161+
* New Platform client-side
162+
*/
163+
{
164+
files: ['{src,x-pack}/plugins/*/public/**/*.{js,ts,tsx}'],
165+
rules: {
166+
'import/no-commonjs': 'error',
167+
},
168+
},
169+
160170
/**
161171
* Files that require Elastic license headers instead of Apache 2.0 header
162172
*/

src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { parse } from 'query-string';
2424
import React, { CSSProperties, useCallback, useEffect, useRef, useState } from 'react';
2525
import { useUIAceKeyboardMode } from '../../../../../../../es_ui_shared/public';
2626
// @ts-ignore
27-
import mappings from '../../../../../lib/mappings/mappings';
27+
import { retrieveAutoCompleteInfo, clearSubscriptions } from '../../../../../lib/mappings/mappings';
2828
import { ConsoleMenu } from '../../../../components';
2929
import { useEditorReadContext, useServicesContext } from '../../../../contexts';
3030
import {
@@ -172,14 +172,14 @@ function EditorUI({ initialTextValue }: EditorProps) {
172172
setInputEditor(editor);
173173
setTextArea(editorRef.current!.querySelector('textarea'));
174174

175-
mappings.retrieveAutoCompleteInfo(settingsService, settingsService.getAutocomplete());
175+
retrieveAutoCompleteInfo(settingsService, settingsService.getAutocomplete());
176176

177177
const unsubscribeResizer = subscribeResizeChecker(editorRef.current!, editor);
178178
setupAutosave();
179179

180180
return () => {
181181
unsubscribeResizer();
182-
mappings.clearSubscriptions();
182+
clearSubscriptions();
183183
window.removeEventListener('hashchange', onHashChange);
184184
};
185185
}, [saveCurrentTextObject, initialTextValue, history, setInputEditor, settingsService]);

src/plugins/console/public/application/containers/settings.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import React from 'react';
2121
import { AutocompleteOptions, DevToolsSettingsModal } from '../components';
2222

2323
// @ts-ignore
24-
import mappings from '../../lib/mappings/mappings';
24+
import { retrieveAutoCompleteInfo } from '../../lib/mappings/mappings';
2525
import { useServicesContext, useEditorActionContext } from '../contexts';
2626
import { DevToolsSettings, Settings as SettingsService } from '../../services';
2727

@@ -33,7 +33,7 @@ const getAutocompleteDiff = (newSettings: DevToolsSettings, prevSettings: DevToo
3333
};
3434

3535
const refreshAutocompleteSettings = (settings: SettingsService, selectedSettings: any) => {
36-
mappings.retrieveAutoCompleteInfo(settings, selectedSettings);
36+
retrieveAutoCompleteInfo(settings, selectedSettings);
3737
};
3838

3939
const fetchAutocompleteSettingsIfNeeded = (
@@ -61,10 +61,10 @@ const fetchAutocompleteSettingsIfNeeded = (
6161
},
6262
{}
6363
);
64-
mappings.retrieveAutoCompleteInfo(settings, changedSettings);
64+
retrieveAutoCompleteInfo(settings, changedSettings);
6565
} else if (isPollingChanged && newSettings.polling) {
6666
// If the user has turned polling on, then we'll fetch all selected autocomplete settings.
67-
mappings.retrieveAutoCompleteInfo(settings, settings.getAutocomplete());
67+
retrieveAutoCompleteInfo(settings, settings.getAutocomplete());
6868
}
6969
}
7070
};

src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { sendRequestToES } from './send_request_to_es';
2424
import { track } from './track';
2525

2626
// @ts-ignore
27-
import mappings from '../../../lib/mappings/mappings';
27+
import { retrieveAutoCompleteInfo } from '../../../lib/mappings/mappings';
2828

2929
export const useSendCurrentRequestToES = () => {
3030
const {
@@ -73,7 +73,7 @@ export const useSendCurrentRequestToES = () => {
7373
// or templates may have changed, so we'll need to update this data. Assume that if
7474
// the user disables polling they're trying to optimize performance or otherwise
7575
// preserve resources, so they won't want this request sent either.
76-
mappings.retrieveAutoCompleteInfo(settings, settings.getAutocomplete());
76+
retrieveAutoCompleteInfo(settings, settings.getAutocomplete());
7777
}
7878

7979
dispatch({

src/plugins/console/public/application/models/legacy_core_editor/__tests__/output_tokenization.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919
import '../legacy_core_editor.test.mocks';
20-
const $ = require('jquery');
20+
import $ from 'jquery';
2121
import RowParser from '../../../../lib/row_parser';
2222
import ace from 'brace';
2323
import { createReadOnlyAceEditor } from '../create_readonly';

src/plugins/console/public/application/models/legacy_core_editor/mode/input.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,21 @@
1919

2020
import ace from 'brace';
2121
import { workerModule } from './worker';
22+
import { ScriptMode } from './script';
2223

2324
const oop = ace.acequire('ace/lib/oop');
2425
const TextMode = ace.acequire('ace/mode/text').Mode;
25-
const ScriptMode = require('./script').ScriptMode;
26+
2627
const MatchingBraceOutdent = ace.acequire('ace/mode/matching_brace_outdent').MatchingBraceOutdent;
2728
const CstyleBehaviour = ace.acequire('ace/mode/behaviour/cstyle').CstyleBehaviour;
2829
const CStyleFoldMode = ace.acequire('ace/mode/folding/cstyle').FoldMode;
2930
const WorkerClient = ace.acequire('ace/worker/worker_client').WorkerClient;
3031
const AceTokenizer = ace.acequire('ace/tokenizer').Tokenizer;
3132

32-
const HighlightRules = require('./input_highlight_rules').InputHighlightRules;
33+
import { InputHighlightRules } from './input_highlight_rules';
3334

3435
export function Mode() {
35-
this.$tokenizer = new AceTokenizer(new HighlightRules().getRules());
36+
this.$tokenizer = new AceTokenizer(new InputHighlightRules().getRules());
3637
this.$outdent = new MatchingBraceOutdent();
3738
this.$behaviour = new CstyleBehaviour();
3839
this.foldingRules = new CStyleFoldMode();

src/plugins/console/public/application/models/legacy_core_editor/mode/input_highlight_rules.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
const ace = require('brace');
20+
import ace from 'brace';
2121
import { addXJsonToRules } from '../../../../../../es_ui_shared/public';
2222

2323
export function addEOL(tokens, reg, nextIfEOL, normalNext) {

src/plugins/console/public/application/models/legacy_core_editor/mode/output.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@
1818
*/
1919

2020
import ace from 'brace';
21-
require('./output_highlight_rules');
21+
22+
import { OutputJsonHighlightRules } from './output_highlight_rules';
2223

2324
const oop = ace.acequire('ace/lib/oop');
2425
const JSONMode = ace.acequire('ace/mode/json').Mode;
25-
const HighlightRules = require('./output_highlight_rules').OutputJsonHighlightRules;
2626
const MatchingBraceOutdent = ace.acequire('ace/mode/matching_brace_outdent').MatchingBraceOutdent;
2727
const CstyleBehaviour = ace.acequire('ace/mode/behaviour/cstyle').CstyleBehaviour;
2828
const CStyleFoldMode = ace.acequire('ace/mode/folding/cstyle').FoldMode;
2929
ace.acequire('ace/worker/worker_client');
3030
const AceTokenizer = ace.acequire('ace/tokenizer').Tokenizer;
3131

3232
export function Mode() {
33-
this.$tokenizer = new AceTokenizer(new HighlightRules().getRules());
33+
this.$tokenizer = new AceTokenizer(new OutputJsonHighlightRules().getRules());
3434
this.$outdent = new MatchingBraceOutdent();
3535
this.$behaviour = new CstyleBehaviour();
3636
this.foldingRules = new CStyleFoldMode();

src/plugins/console/public/application/models/legacy_core_editor/mode/output_highlight_rules.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
const ace = require('brace');
20+
import ace from 'brace';
2121
import 'brace/mode/json';
2222
import { addXJsonToRules } from '../../../../../../es_ui_shared/public';
2323

src/plugins/console/public/application/models/legacy_core_editor/theme_sense_dark.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
/* eslint import/no-unresolved: 0 */
21-
const ace = require('brace');
21+
import ace from 'brace';
2222

2323
ace.define('ace/theme/sense-dark', ['require', 'exports', 'module'], function(require, exports) {
2424
exports.isDark = true;

0 commit comments

Comments
 (0)