diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 23ffd625615..4ab61bec336 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -438,6 +438,7 @@ lerna.json @grafana/frontend-ops /public/gazetteer/ @ryantxu /public/img/ @grafana/grafana-frontend-platform /public/lib/ @grafana/grafana-frontend-platform +/public/lib/monaco-languages/kusto.ts @grafana/partner-datasources /public/maps/ @ryantxu /public/robots.txt @grafana/frontend-ops /public/sass/ @grafana/grafana-frontend-platform diff --git a/package.json b/package.json index ca6fd3c3a8b..5e007017f28 100644 --- a/package.json +++ b/package.json @@ -264,7 +264,7 @@ "@grafana/scenes": "^0.14.0", "@grafana/schema": "workspace:*", "@grafana/ui": "workspace:*", - "@kusto/monaco-kusto": "5.3.6", + "@kusto/monaco-kusto": "^7.4.0", "@leeoniya/ufuzzy": "1.0.6", "@lezer/common": "1.0.2", "@lezer/highlight": "1.1.3", diff --git a/public/lib/monaco-languages/kusto.ts b/public/lib/monaco-languages/kusto.ts index 4c2e40abef6..9c19372920f 100644 --- a/public/lib/monaco-languages/kusto.ts +++ b/public/lib/monaco-languages/kusto.ts @@ -5,17 +5,6 @@ declare global { } } -const monacoPath = (window.__grafana_public_path__ ?? 'public/') + 'lib/monaco/min/vs'; - -const scripts = [ - [`${monacoPath}/language/kusto/bridge.min.js`], - [ - `${monacoPath}/language/kusto/kusto.javascript.client.min.js`, - `${monacoPath}/language/kusto/newtonsoft.json.min.js`, - `${monacoPath}/language/kusto/Kusto.Language.Bridge.min.js`, - ], -]; - function loadScript(script: HTMLScriptElement | string): Promise { return new Promise((resolve, reject) => { let scriptEl: HTMLScriptElement; @@ -47,6 +36,16 @@ const loadMonacoKusto = () => { }; export default async function loadKusto() { + const monacoPath = (window.__grafana_public_path__ ?? 'public/') + 'lib/monaco/min/vs'; + + const scripts = [ + [`${monacoPath}/language/kusto/bridge.min.js`], + [ + `${monacoPath}/language/kusto/kusto.javascript.client.min.js`, + `${monacoPath}/language/kusto/newtonsoft.json.min.js`, + `${monacoPath}/language/kusto/Kusto.Language.Bridge.min.js`, + ], + ]; let promise = Promise.resolve(); for (const parallelScripts of scripts) { diff --git a/scripts/webpack/webpack.common.js b/scripts/webpack/webpack.common.js index 5413e9cc763..c9fad0b4d62 100644 --- a/scripts/webpack/webpack.common.js +++ b/scripts/webpack/webpack.common.js @@ -60,7 +60,7 @@ module.exports = { }, }, { - context: path.join(require.resolve('@kusto/monaco-kusto'), '../'), + context: path.join(require.resolve('@kusto/monaco-kusto/package.json'), '../release/min'), from: '**/*', to: '../lib/monaco/min/vs/language/kusto/', }, diff --git a/yarn.lock b/yarn.lock index abd58d5b0e0..38931dd44ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1946,6 +1946,16 @@ __metadata: languageName: node linkType: hard +"@babel/runtime-corejs3@npm:^7.16.5": + version: 7.22.3 + resolution: "@babel/runtime-corejs3@npm:7.22.3" + dependencies: + core-js-pure: ^3.30.2 + regenerator-runtime: ^0.13.11 + checksum: ec92a0b874669bb5eff9e7f20d4e0dbfb0bb5d433bd9e2d6f892c38884079d657240165306a402bb4747942765bdd37b7b5857c573505d2179c1fa4162bf966b + languageName: node + linkType: hard + "@babel/runtime@npm:7.22.3, @babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": version: 7.22.3 resolution: "@babel/runtime@npm:7.22.3" @@ -4311,29 +4321,34 @@ __metadata: languageName: node linkType: hard -"@kusto/language-service-next@npm:0.0.59": - version: 0.0.59 - resolution: "@kusto/language-service-next@npm:0.0.59" - checksum: 90f377a4c59e632a2fd904c202be3c823f41359b62b05a7bc66fd4a9e86d7bed34970822b720232dacd45f6ce3373abff53fb843b5228878c5f84f5b5ba68fba +"@kusto/language-service-next@npm:0.0.66": + version: 0.0.66 + resolution: "@kusto/language-service-next@npm:0.0.66" + checksum: d85dda481fc72b81097481ed6a8f51fe342cfbe17e8436c9a69ad22904e3c1695b4fbf26d63aef891e8d6f262d618e939e5ad5bdbd531c7cd4cd16ad91095865 languageName: node linkType: hard -"@kusto/language-service@npm:0.0.38": - version: 0.0.38 - resolution: "@kusto/language-service@npm:0.0.38" - checksum: 9ad45b144409162298f1e61b87209e40315f3fe30b5766175b831ce9ab6b5cd4f046323956fa35ce971993aa67f84b175c5af1de9614dd57a12f4fd61bfa401c +"@kusto/language-service@npm:0.0.43": + version: 0.0.43 + resolution: "@kusto/language-service@npm:0.0.43" + checksum: cae1ddf61424ff34e631e2defe54fc6344877079101b164d611606885207fef9128cfcf079f51b7dd8856132cf458e208396f418f7eb63c6342986c167a3be23 languageName: node linkType: hard -"@kusto/monaco-kusto@npm:5.3.6": - version: 5.3.6 - resolution: "@kusto/monaco-kusto@npm:5.3.6" +"@kusto/monaco-kusto@npm:^7.4.0": + version: 7.4.0 + resolution: "@kusto/monaco-kusto@npm:7.4.0" dependencies: - "@kusto/language-service": 0.0.38 - "@kusto/language-service-next": 0.0.59 + "@kusto/language-service": 0.0.43 + "@kusto/language-service-next": 0.0.66 + lodash-es: ^4.17.21 + vscode-languageserver-types: 3.16.0 + xregexp: ^5.1.1 peerDependencies: - monaco-editor: 0.34.1 - checksum: 55cef304cca6383ed4bccd60639d7429e2bee224e719eb33b294067ba47086df51752d5a51d9bb8cd73b7fe5a2fa3d6e5f625d392d013e281c451d967a529672 + monaco-editor: ~0.38.0 + bin: + copyMonacoFilesAMD: copyMonacoFilesAMD.js + checksum: d3905b049729f1b58286e868c000f934f237db07745f5498121c839bdf65e41c2564dca5a0ee0e53c9e4c413e2843e92cfbb2e5910bee620746625da02d4bf8d languageName: node linkType: hard @@ -13791,6 +13806,13 @@ __metadata: languageName: node linkType: hard +"core-js-pure@npm:^3.30.2": + version: 3.30.2 + resolution: "core-js-pure@npm:3.30.2" + checksum: e0e012fe94e38663d837410baac62efe05d0c7431e3fbaa70c65f51eb980da9c3add225eca04208d576bc0d92cefeca9a4f7671a65fd84fd7dfc92d8618dddfd + languageName: node + linkType: hard + "core-js@npm:3.28.0": version: 3.28.0 resolution: "core-js@npm:3.28.0" @@ -18200,7 +18222,7 @@ __metadata: "@grafana/toolkit": "workspace:*" "@grafana/tsconfig": ^1.2.0-rc1 "@grafana/ui": "workspace:*" - "@kusto/monaco-kusto": 5.3.6 + "@kusto/monaco-kusto": ^7.4.0 "@leeoniya/ufuzzy": 1.0.6 "@lezer/common": 1.0.2 "@lezer/highlight": 1.1.3 @@ -21914,6 +21936,13 @@ __metadata: languageName: node linkType: hard +"lodash-es@npm:^4.17.21": + version: 4.17.21 + resolution: "lodash-es@npm:4.17.21" + checksum: 05cbffad6e2adbb331a4e16fbd826e7faee403a1a04873b82b42c0f22090f280839f85b95393f487c1303c8a3d2a010048bf06151a6cbe03eee4d388fb0a12d2 + languageName: node + linkType: hard + "lodash.debounce@npm:^4.0.8": version: 4.0.8 resolution: "lodash.debounce@npm:4.0.8" @@ -31458,6 +31487,13 @@ __metadata: languageName: node linkType: hard +"vscode-languageserver-types@npm:3.16.0": + version: 3.16.0 + resolution: "vscode-languageserver-types@npm:3.16.0" + checksum: 7a44fb10b9fbeb9529f832337b7f0430fc6275d62945b86851d425a950e22da3917ef5f6c552688191769dd1eae047c6ee9ec3d9f2280498353007c2dfe0725c + languageName: node + linkType: hard + "vue-template-compiler@npm:^2.6.11": version: 2.7.10 resolution: "vue-template-compiler@npm:2.7.10" @@ -32264,6 +32300,15 @@ __metadata: languageName: node linkType: hard +"xregexp@npm:^5.1.1": + version: 5.1.1 + resolution: "xregexp@npm:5.1.1" + dependencies: + "@babel/runtime-corejs3": ^7.16.5 + checksum: b7fee45db0daacc68d8f747c9d3865af6b1135866c6dbd72980fc7d61138310018c397effdc0ec1f50ced71b9437ccb70c27818f4470e28e48dc59ea6e3900a0 + languageName: node + linkType: hard + "xss@npm:^1.0.14": version: 1.0.14 resolution: "xss@npm:1.0.14"