Skip to content

Commit 48396d9

Browse files
committed
use library and add note for monaco issue
1 parent ffb5d02 commit 48396d9

File tree

4 files changed

+9749
-8789
lines changed

4 files changed

+9749
-8789
lines changed

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,12 @@
9292
"@emotion/css": "11.11.2",
9393
"@grafana/aws-sdk": "0.1.3",
9494
"@grafana/data": "10.2.0",
95-
"@grafana/experimental": "1.7.3",
95+
"@grafana/experimental": "1.7.9",
9696
"@grafana/faro-web-sdk": "1.2.1",
97-
"@grafana/runtime": "10.2.0",
97+
"@grafana/runtime": "10.3.0",
9898
"@grafana/schema": "10.2.0",
99-
"@grafana/ui": "10.2.0",
99+
"@grafana/ui": "10.3.0",
100+
"@grafana/prometheus": "0.0.1",
100101
"@leeoniya/ufuzzy": "1.0.8",
101102
"@lezer/common": "1.1.0",
102103
"@lezer/highlight": "1.1.3",

src/components/monaco-query-field/MonacoQueryField.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ function ensurePromQL(monaco: Monaco) {
6464
PROMQL_SETUP_STARTED = true;
6565
const { aliases, extensions, mimetypes, loader } = promLanguageDefinition;
6666
monaco.languages.register({ id: PROMQL_LANG_ID, aliases, extensions, mimetypes });
67-
67+
// This does not work in the external datasource
68+
// see library for removing loader in favor of importing language and languageConfiguration
6869
loader().then((mod) => {
6970
monaco.languages.setMonarchTokensProvider(PROMQL_LANG_ID, mod.language);
7071
monaco.languages.setLanguageConfiguration(PROMQL_LANG_ID, mod.languageConfiguration);

src/module.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
import { DataSourcePlugin } from '@grafana/data';
2+
import { ConfigEditor, PromQueryEditorByApp, PrometheusDatasource, PromCheatSheet } from '@grafana/prometheus';
23

3-
import PromCheatSheet from './components/PromCheatSheet';
4-
import PromQueryEditorByApp from './components/PromQueryEditorByApp';
5-
import { ConfigEditor } from './configuration/ConfigEditor';
6-
import { PrometheusDatasource } from './datasource';
4+
// import PromCheatSheet from './components/PromCheatSheet';
5+
// import PromQueryEditorByApp from './components/PromQueryEditorByApp';
6+
// import { ConfigEditor } from './configuration/ConfigEditor';
7+
// import { PrometheusDatasource } from './datasource';
78

9+
// @ts-ignore
810
export const plugin = new DataSourcePlugin(PrometheusDatasource)
11+
// @ts-ignore
912
.setQueryEditor(PromQueryEditorByApp)
1013
.setConfigEditor(ConfigEditor)
14+
// @ts-ignore
1115
.setQueryEditorHelp(PromCheatSheet);

0 commit comments

Comments
 (0)