diff --git a/web/ui/module/codemirror-promql/jest.config.cjs b/web/ui/module/codemirror-promql/jest.config.cjs index bf1adc69cc..611315f791 100644 --- a/web/ui/module/codemirror-promql/jest.config.cjs +++ b/web/ui/module/codemirror-promql/jest.config.cjs @@ -12,7 +12,7 @@ module.exports = { }, }, moduleNameMapper: { - 'lezer-promql': '/../../node_modules/lezer-promql/dist/index.es.js' + 'lezer-promql': '/../../node_modules/@prometheus-io/lezer-promql/dist/index.es.js' }, - transformIgnorePatterns: ["/../../node_modules/(?!lezer-promql)/"] + transformIgnorePatterns: ["/../../node_modules/(?!@prometheus-io/lezer-promql)/"] }; diff --git a/web/ui/module/codemirror-promql/package.json b/web/ui/module/codemirror-promql/package.json index 9e66f4d759..84cdc74dad 100644 --- a/web/ui/module/codemirror-promql/package.json +++ b/web/ui/module/codemirror-promql/package.json @@ -1,5 +1,5 @@ { - "name": "codemirror-promql", + "name": "@prometheus-io/codemirror-promql", "version": "0.19.0", "description": "a CodeMirror mode for the PromQL language", "types": "dist/esm/index.d.ts", @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/prometheus/prometheus/blob/main/web/ui/module/codemirror-promql/README.md", "dependencies": { - "lezer-promql": "0.23.0", + "@prometheus-io/lezer-promql": "0.23.0", "lru-cache": "^6.0.0" }, "devDependencies": { diff --git a/web/ui/module/codemirror-promql/src/complete/hybrid.test.ts b/web/ui/module/codemirror-promql/src/complete/hybrid.test.ts index 99a21f3639..2f02c0a3d9 100644 --- a/web/ui/module/codemirror-promql/src/complete/hybrid.test.ts +++ b/web/ui/module/codemirror-promql/src/complete/hybrid.test.ts @@ -26,7 +26,7 @@ import { numberTerms, snippets, } from './promql.terms'; -import { EqlSingle, Neq } from 'lezer-promql'; +import { EqlSingle, Neq } from '@prometheus-io/lezer-promql'; import { syntaxTree } from '@codemirror/language'; import { newCompleteStrategy } from './index'; diff --git a/web/ui/module/codemirror-promql/src/complete/hybrid.ts b/web/ui/module/codemirror-promql/src/complete/hybrid.ts index 3cc2817aab..fbcac0c9b0 100644 --- a/web/ui/module/codemirror-promql/src/complete/hybrid.ts +++ b/web/ui/module/codemirror-promql/src/complete/hybrid.ts @@ -58,7 +58,7 @@ import { SubqueryExpr, Unless, VectorSelector, -} from 'lezer-promql'; +} from '@prometheus-io/lezer-promql'; import { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete'; import { EditorState } from '@codemirror/state'; import { buildLabelMatchers, containsAtLeastOneChild, containsChild, retrieveAllRecursiveNodes, walkBackward, walkThrough } from '../parser'; diff --git a/web/ui/module/codemirror-promql/src/parser/matcher.test.ts b/web/ui/module/codemirror-promql/src/parser/matcher.test.ts index 4f8f7a7877..7e5f92ed3e 100644 --- a/web/ui/module/codemirror-promql/src/parser/matcher.test.ts +++ b/web/ui/module/codemirror-promql/src/parser/matcher.test.ts @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { EqlRegex, EqlSingle, Neq, NeqRegex } from 'lezer-promql'; +import { EqlRegex, EqlSingle, Neq, NeqRegex } from '@prometheus-io/lezer-promql'; import { labelMatchersToString } from './matcher'; import { Matcher } from '../types'; diff --git a/web/ui/module/codemirror-promql/src/parser/matcher.ts b/web/ui/module/codemirror-promql/src/parser/matcher.ts index 2950b4fca9..d9590d78e6 100644 --- a/web/ui/module/codemirror-promql/src/parser/matcher.ts +++ b/web/ui/module/codemirror-promql/src/parser/matcher.ts @@ -12,7 +12,7 @@ // limitations under the License. import { SyntaxNode } from '@lezer/common'; -import { EqlRegex, EqlSingle, LabelName, MatchOp, Neq, NeqRegex, StringLiteral } from 'lezer-promql'; +import { EqlRegex, EqlSingle, LabelName, MatchOp, Neq, NeqRegex, StringLiteral } from '@prometheus-io/lezer-promql'; import { EditorState } from '@codemirror/state'; import { Matcher } from '../types'; diff --git a/web/ui/module/codemirror-promql/src/parser/parser.ts b/web/ui/module/codemirror-promql/src/parser/parser.ts index 3f782b978e..bc9fcd035a 100644 --- a/web/ui/module/codemirror-promql/src/parser/parser.ts +++ b/web/ui/module/codemirror-promql/src/parser/parser.ts @@ -47,7 +47,7 @@ import { UnaryExpr, Unless, VectorSelector, -} from 'lezer-promql'; +} from '@prometheus-io/lezer-promql'; import { containsAtLeastOneChild, retrieveAllRecursiveNodes, walkThrough } from './path-finder'; import { getType } from './type'; import { buildLabelMatchers } from './matcher'; diff --git a/web/ui/module/codemirror-promql/src/parser/path-finder.test.ts b/web/ui/module/codemirror-promql/src/parser/path-finder.test.ts index 39764efd03..514dddf107 100644 --- a/web/ui/module/codemirror-promql/src/parser/path-finder.test.ts +++ b/web/ui/module/codemirror-promql/src/parser/path-finder.test.ts @@ -31,7 +31,7 @@ import { NumberLiteral, Sub, VectorSelector, -} from 'lezer-promql'; +} from '@prometheus-io/lezer-promql'; import { createEditorState } from '../test/utils-test'; import { containsAtLeastOneChild, containsChild, retrieveAllRecursiveNodes, walkBackward, walkThrough } from './path-finder'; import { SyntaxNode } from '@lezer/common'; diff --git a/web/ui/module/codemirror-promql/src/parser/type.ts b/web/ui/module/codemirror-promql/src/parser/type.ts index 989756b17a..9bcb74843b 100644 --- a/web/ui/module/codemirror-promql/src/parser/type.ts +++ b/web/ui/module/codemirror-promql/src/parser/type.ts @@ -26,7 +26,7 @@ import { SubqueryExpr, UnaryExpr, VectorSelector, -} from 'lezer-promql'; +} from '@prometheus-io/lezer-promql'; import { walkThrough } from './path-finder'; import { getFunction, ValueType } from '../types'; diff --git a/web/ui/module/codemirror-promql/src/parser/vector.test.ts b/web/ui/module/codemirror-promql/src/parser/vector.test.ts index 43e7deeaa1..c4f2a8f03a 100644 --- a/web/ui/module/codemirror-promql/src/parser/vector.test.ts +++ b/web/ui/module/codemirror-promql/src/parser/vector.test.ts @@ -14,7 +14,7 @@ import { buildVectorMatching } from './vector'; import { createEditorState } from '../test/utils-test'; import { walkThrough } from './path-finder'; -import { BinaryExpr, Expr } from 'lezer-promql'; +import { BinaryExpr, Expr } from '@prometheus-io/lezer-promql'; import { syntaxTree } from '@codemirror/language'; import { VectorMatchCardinality } from '../types'; diff --git a/web/ui/module/codemirror-promql/src/parser/vector.ts b/web/ui/module/codemirror-promql/src/parser/vector.ts index 58d1edd44d..c1a59dfb4b 100644 --- a/web/ui/module/codemirror-promql/src/parser/vector.ts +++ b/web/ui/module/codemirror-promql/src/parser/vector.ts @@ -26,7 +26,7 @@ import { OnOrIgnoring, Or, Unless, -} from 'lezer-promql'; +} from '@prometheus-io/lezer-promql'; import { VectorMatchCardinality, VectorMatching } from '../types'; import { containsAtLeastOneChild, retrieveAllRecursiveNodes } from './path-finder'; diff --git a/web/ui/module/codemirror-promql/src/promql.ts b/web/ui/module/codemirror-promql/src/promql.ts index e20a15c97f..86fb413ad4 100644 --- a/web/ui/module/codemirror-promql/src/promql.ts +++ b/web/ui/module/codemirror-promql/src/promql.ts @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { parser } from 'lezer-promql'; +import { parser } from '@prometheus-io/lezer-promql'; import { styleTags, tags } from '@codemirror/highlight'; import { Extension } from '@codemirror/state'; import { CompleteConfiguration, CompleteStrategy, newCompleteStrategy } from './complete'; diff --git a/web/ui/module/codemirror-promql/src/test/utils-test.ts b/web/ui/module/codemirror-promql/src/test/utils-test.ts index 5e1e7fa8f5..094b6a5696 100644 --- a/web/ui/module/codemirror-promql/src/test/utils-test.ts +++ b/web/ui/module/codemirror-promql/src/test/utils-test.ts @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { parser } from 'lezer-promql'; +import { parser } from '@prometheus-io/lezer-promql'; import { EditorState } from '@codemirror/state'; import { LRLanguage } from '@codemirror/language'; import nock from 'nock'; diff --git a/web/ui/module/codemirror-promql/src/types/function.ts b/web/ui/module/codemirror-promql/src/types/function.ts index 9f99d359d0..a8d1329a91 100644 --- a/web/ui/module/codemirror-promql/src/types/function.ts +++ b/web/ui/module/codemirror-promql/src/types/function.ts @@ -79,7 +79,7 @@ import { Timestamp, Vector, Year, -} from 'lezer-promql'; +} from '@prometheus-io/lezer-promql'; export enum ValueType { none = 'none', diff --git a/web/ui/module/codemirror-promql/src/types/matcher.ts b/web/ui/module/codemirror-promql/src/types/matcher.ts index be3c06eaf5..a830aca693 100644 --- a/web/ui/module/codemirror-promql/src/types/matcher.ts +++ b/web/ui/module/codemirror-promql/src/types/matcher.ts @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { EqlSingle, Neq } from 'lezer-promql'; +import { EqlSingle, Neq } from '@prometheus-io/lezer-promql'; export class Matcher { type: number; diff --git a/web/ui/module/lezer-promql/package.json b/web/ui/module/lezer-promql/package.json index 42b3b28a12..91c10fa7a1 100644 --- a/web/ui/module/lezer-promql/package.json +++ b/web/ui/module/lezer-promql/package.json @@ -1,5 +1,5 @@ { - "name": "lezer-promql", + "name": "@prometheus-io/lezer-promql", "version": "0.23.0", "description": "lezer-based PromQL grammar", "main": "index.cjs", diff --git a/web/ui/package-lock.json b/web/ui/package-lock.json index a7d6d74e39..35fbcb5871 100644 --- a/web/ui/package-lock.json +++ b/web/ui/package-lock.json @@ -1,10 +1,10 @@ { - "name": "prometheus", + "name": "prometheus-io", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "prometheus", + "name": "prometheus-io", "workspaces": [ "react-app", "module/*" @@ -27,10 +27,11 @@ } }, "module/codemirror-promql": { + "name": "@prometheus-io/codemirror-promql", "version": "0.19.0", "license": "Apache-2.0", "dependencies": { - "lezer-promql": "0.23.0", + "@prometheus-io/lezer-promql": "0.23.0", "lru-cache": "^6.0.0" }, "devDependencies": { @@ -60,6 +61,7 @@ } }, "module/lezer-promql": { + "name": "@prometheus-io/lezer-promql", "version": "0.23.0", "license": "Apache-2.0", "devDependencies": { @@ -3140,6 +3142,18 @@ "node": ">= 8" } }, + "node_modules/@prometheus-io/app": { + "resolved": "react-app", + "link": true + }, + "node_modules/@prometheus-io/codemirror-promql": { + "resolved": "module/codemirror-promql", + "link": true + }, + "node_modules/@prometheus-io/lezer-promql": { + "resolved": "module/lezer-promql", + "link": true + }, "node_modules/@rollup/plugin-babel": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz", @@ -5858,10 +5872,6 @@ "node": ">=4" } }, - "node_modules/codemirror-promql": { - "resolved": "module/codemirror-promql", - "link": true - }, "node_modules/collect-v8-coverage": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", @@ -8775,10 +8785,6 @@ "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==", "dev": true }, - "node_modules/graph": { - "resolved": "react-app", - "link": true - }, "node_modules/gud": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz", @@ -10782,10 +10788,6 @@ "node": ">= 0.8.0" } }, - "node_modules/lezer-promql": { - "resolved": "module/lezer-promql", - "link": true - }, "node_modules/lilconfig": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz", @@ -17312,7 +17314,7 @@ } }, "react-app": { - "name": "graph", + "name": "@prometheus-io/app", "version": "0.1.0", "dependencies": { "@codemirror/autocomplete": "^0.19.9", @@ -17333,8 +17335,8 @@ "@fortawesome/react-fontawesome": "0.1.17", "@nexucis/fuzzy": "^0.4.0", "@nexucis/kvsearch": "^0.7.0", + "@prometheus-io/codemirror-promql": "0.19.0", "bootstrap": "^4.6.1", - "codemirror-promql": "0.19.0", "css.escape": "^1.5.1", "downshift": "^6.1.7", "http-proxy-middleware": "^2.0.6", @@ -19602,6 +19604,93 @@ } } }, + "@prometheus-io/app": { + "version": "file:react-app", + "requires": { + "@codemirror/autocomplete": "^0.19.9", + "@codemirror/closebrackets": "^0.19.0", + "@codemirror/commands": "^0.19.5", + "@codemirror/comment": "^0.19.0", + "@codemirror/highlight": "^0.19.6", + "@codemirror/history": "^0.19.2", + "@codemirror/language": "^0.19.7", + "@codemirror/lint": "^0.19.3", + "@codemirror/matchbrackets": "^0.19.3", + "@codemirror/search": "^0.19.3", + "@codemirror/state": "^0.19.6", + "@codemirror/view": "^0.19.27", + "@forevolve/bootstrap-dark": "^1.0.0", + "@fortawesome/fontawesome-svg-core": "6.1.1", + "@fortawesome/free-solid-svg-icons": "6.1.1", + "@fortawesome/react-fontawesome": "0.1.17", + "@nexucis/fuzzy": "^0.4.0", + "@nexucis/kvsearch": "^0.7.0", + "@prometheus-io/codemirror-promql": "0.19.0", + "@testing-library/react-hooks": "^7.0.1", + "@types/enzyme": "^3.10.10", + "@types/flot": "0.0.32", + "@types/jquery": "^3.5.9", + "@types/react": "^17.0.39", + "@types/react-copy-to-clipboard": "^5.0.2", + "@types/react-dom": "^17.0.11", + "@types/react-resize-detector": "^6.1.0", + "@types/react-router-dom": "^5.3.2", + "@types/sanitize-html": "^2.6.1", + "@types/sinon": "^10.0.6", + "@wojtekmaj/enzyme-adapter-react-17": "^0.6.6", + "bootstrap": "^4.6.1", + "css.escape": "^1.5.1", + "downshift": "^6.1.7", + "enzyme": "^3.11.0", + "enzyme-to-json": "^3.6.2", + "fsevents": "^2.3.2", + "http-proxy-middleware": "^2.0.6", + "jquery": "^3.5.1", + "jquery.flot.tooltip": "^0.9.0", + "moment": "^2.29.2", + "moment-timezone": "^0.5.34", + "mutationobserver-shim": "^0.3.7", + "popper.js": "^1.14.3", + "react": "^17.0.2", + "react-copy-to-clipboard": "^5.0.4", + "react-dom": "^17.0.2", + "react-infinite-scroll-component": "^6.1.0", + "react-resize-detector": "^6.7.6", + "react-router-dom": "^5.2.1", + "react-test-renderer": "^17.0.2", + "reactstrap": "^8.9.0", + "sanitize-html": "^2.6.0", + "sass": "1.49.11", + "sinon": "^13.0.1", + "tempusdominus-bootstrap-4": "^5.1.2", + "tempusdominus-core": "^5.0.3" + } + }, + "@prometheus-io/codemirror-promql": { + "version": "file:module/codemirror-promql", + "requires": { + "@codemirror/autocomplete": "^0.19.15", + "@codemirror/highlight": "^0.19.8", + "@codemirror/language": "^0.19.10", + "@codemirror/lint": "^0.19.6", + "@codemirror/state": "^0.19.9", + "@codemirror/view": "^0.19.48", + "@lezer/common": "^0.15.12", + "@lezer/lr": "^0.15.8", + "@prometheus-io/lezer-promql": "0.23.0", + "@types/lru-cache": "^5.1.1", + "isomorphic-fetch": "^3.0.0", + "lru-cache": "^6.0.0", + "nock": "^13.2.4" + } + }, + "@prometheus-io/lezer-promql": { + "version": "file:module/lezer-promql", + "requires": { + "@lezer/generator": "^0.15.4", + "@lezer/lr": "^0.15.8" + } + }, "@rollup/plugin-babel": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz", @@ -21720,24 +21809,6 @@ } } }, - "codemirror-promql": { - "version": "file:module/codemirror-promql", - "requires": { - "@codemirror/autocomplete": "^0.19.15", - "@codemirror/highlight": "^0.19.8", - "@codemirror/language": "^0.19.10", - "@codemirror/lint": "^0.19.6", - "@codemirror/state": "^0.19.9", - "@codemirror/view": "^0.19.48", - "@lezer/common": "^0.15.12", - "@lezer/lr": "^0.15.8", - "@types/lru-cache": "^5.1.1", - "isomorphic-fetch": "^3.0.0", - "lezer-promql": "0.23.0", - "lru-cache": "^6.0.0", - "nock": "^13.2.4" - } - }, "collect-v8-coverage": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", @@ -23932,68 +24003,6 @@ "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==", "dev": true }, - "graph": { - "version": "file:react-app", - "requires": { - "@codemirror/autocomplete": "^0.19.9", - "@codemirror/closebrackets": "^0.19.0", - "@codemirror/commands": "^0.19.5", - "@codemirror/comment": "^0.19.0", - "@codemirror/highlight": "^0.19.6", - "@codemirror/history": "^0.19.2", - "@codemirror/language": "^0.19.7", - "@codemirror/lint": "^0.19.3", - "@codemirror/matchbrackets": "^0.19.3", - "@codemirror/search": "^0.19.3", - "@codemirror/state": "^0.19.6", - "@codemirror/view": "^0.19.27", - "@forevolve/bootstrap-dark": "^1.0.0", - "@fortawesome/fontawesome-svg-core": "6.1.1", - "@fortawesome/free-solid-svg-icons": "6.1.1", - "@fortawesome/react-fontawesome": "0.1.17", - "@nexucis/fuzzy": "^0.4.0", - "@nexucis/kvsearch": "^0.7.0", - "@testing-library/react-hooks": "^7.0.1", - "@types/enzyme": "^3.10.10", - "@types/flot": "0.0.32", - "@types/jquery": "^3.5.9", - "@types/react": "^17.0.39", - "@types/react-copy-to-clipboard": "^5.0.2", - "@types/react-dom": "^17.0.11", - "@types/react-resize-detector": "^6.1.0", - "@types/react-router-dom": "^5.3.2", - "@types/sanitize-html": "^2.6.1", - "@types/sinon": "^10.0.6", - "@wojtekmaj/enzyme-adapter-react-17": "^0.6.6", - "bootstrap": "^4.6.1", - "codemirror-promql": "0.19.0", - "css.escape": "^1.5.1", - "downshift": "^6.1.7", - "enzyme": "^3.11.0", - "enzyme-to-json": "^3.6.2", - "fsevents": "^2.3.2", - "http-proxy-middleware": "^2.0.6", - "jquery": "^3.5.1", - "jquery.flot.tooltip": "^0.9.0", - "moment": "^2.29.2", - "moment-timezone": "^0.5.34", - "mutationobserver-shim": "^0.3.7", - "popper.js": "^1.14.3", - "react": "^17.0.2", - "react-copy-to-clipboard": "^5.0.4", - "react-dom": "^17.0.2", - "react-infinite-scroll-component": "^6.1.0", - "react-resize-detector": "^6.7.6", - "react-router-dom": "^5.2.1", - "react-test-renderer": "^17.0.2", - "reactstrap": "^8.9.0", - "sanitize-html": "^2.6.0", - "sass": "1.49.11", - "sinon": "^13.0.1", - "tempusdominus-bootstrap-4": "^5.1.2", - "tempusdominus-core": "^5.0.3" - } - }, "gud": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz", @@ -25504,13 +25513,6 @@ "type-check": "~0.4.0" } }, - "lezer-promql": { - "version": "file:module/lezer-promql", - "requires": { - "@lezer/generator": "^0.15.4", - "@lezer/lr": "^0.15.8" - } - }, "lilconfig": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz", diff --git a/web/ui/package.json b/web/ui/package.json index 4273108b4d..d5437a0f99 100644 --- a/web/ui/package.json +++ b/web/ui/package.json @@ -1,5 +1,5 @@ { - "name": "prometheus", + "name": "prometheus-io", "private": true, "scripts": { "build": "bash build_ui.sh --all", diff --git a/web/ui/react-app/package.json b/web/ui/react-app/package.json index ee2dc8ed77..aaf8166e52 100644 --- a/web/ui/react-app/package.json +++ b/web/ui/react-app/package.json @@ -1,5 +1,5 @@ { - "name": "graph", + "name": "@prometheus-io/app", "version": "0.1.0", "private": true, "dependencies": { @@ -21,8 +21,8 @@ "@fortawesome/react-fontawesome": "0.1.17", "@nexucis/fuzzy": "^0.4.0", "@nexucis/kvsearch": "^0.7.0", + "@prometheus-io/codemirror-promql": "0.19.0", "bootstrap": "^4.6.1", - "codemirror-promql": "0.19.0", "css.escape": "^1.5.1", "downshift": "^6.1.7", "http-proxy-middleware": "^2.0.6", @@ -89,11 +89,11 @@ "enzyme-to-json/serializer" ], "transformIgnorePatterns": [ - "/../node_modules/(?!codemirror-promql)/", - "/../node_modules/(?!lezer-promql)/" + "/../node_modules/(?!@prometheus-io/codemirror-promql)/", + "/../node_modules/(?!@prometheus-io/lezer-promql)/" ], "moduleNameMapper": { - "lezer-promql": "/../node_modules/lezer-promql/dist/index.cjs" + "lezer-promql": "/../node_modules/@prometheus-io/lezer-promql/dist/index.cjs" } }, "optionalDependencies": { diff --git a/web/ui/react-app/src/pages/graph/ExpressionInput.tsx b/web/ui/react-app/src/pages/graph/ExpressionInput.tsx index a4448b4e89..05f4c7ba6e 100644 --- a/web/ui/react-app/src/pages/graph/ExpressionInput.tsx +++ b/web/ui/react-app/src/pages/graph/ExpressionInput.tsx @@ -19,8 +19,8 @@ import { faSearch, faSpinner, faGlobeEurope } from '@fortawesome/free-solid-svg- import MetricsExplorer from './MetricsExplorer'; import { usePathPrefix } from '../../contexts/PathPrefixContext'; import { useTheme } from '../../contexts/ThemeContext'; -import { CompleteStrategy, PromQLExtension } from 'codemirror-promql'; -import { newCompleteStrategy } from 'codemirror-promql/dist/esm/complete'; +import { CompleteStrategy, PromQLExtension } from '@prometheus-io/codemirror-promql'; +import { newCompleteStrategy } from '@prometheus-io/codemirror-promql/dist/esm/complete'; const promqlExtension = new PromQLExtension();