From 3e5de4b1f51bfc97ab39aba5dc28cadd1aef4ed0 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Wed, 21 Oct 2026 22:56:53 -0400 Subject: [PATCH] chore: Upgrade refractor from 3 to 5 (#14195) * chore: Upgrade refractor from 3 to 5 * Revert unrelated tsconfig formatting --- package.json | 4 +- shared/editor/lib/code.test.ts | 15 ++ shared/editor/lib/code.ts | 130 +++++------ .../editor/plugins/CodeHighlightingPlugin.ts | 18 +- shared/typings/refractor.d.ts | 18 -- tsconfig.json | 5 +- yarn.lock | 205 +++++++++--------- 7 files changed, 201 insertions(+), 194 deletions(-) delete mode 100644 shared/typings/refractor.d.ts diff --git a/package.json b/package.json index cf31bff244..30892ad650 100644 --- a/package.json +++ b/package.json @@ -232,7 +232,7 @@ "react-zoom-pan-pinch": "^3.7.0", "redlock": "^5.0.0-beta2", "reflect-metadata": "^0.2.2", - "refractor": "^3.6.0", + "refractor": "^5.0.0", "resolve-path": "^1.4.0", "sanitize-filename": "^1.6.4", "scroll-into-view-if-needed": "^3.1.0", @@ -309,7 +309,6 @@ "@types/react-router-dom": "^5.3.3", "@types/readable-stream": "^4.0.24", "@types/redis-info": "^3.0.3", - "@types/refractor": "^3.4.1", "@types/resolve-path": "^1.4.3", "@types/semver": "^7.7.1", "@types/slug": "^5.0.9", @@ -344,7 +343,6 @@ "@types/react": "19.3.0", "@types/koa": "2.15.1", "prosemirror-transform": "1.10.5", - "prismjs": "1.30.0", "zod": "^4.5.4", "@types/markdown-it": "14.2.0", "ip-address@npm:10.1.0": "^10.2.0", diff --git a/shared/editor/lib/code.test.ts b/shared/editor/lib/code.test.ts index 8d60da26e4..824924f189 100644 --- a/shared/editor/lib/code.test.ts +++ b/shared/editor/lib/code.test.ts @@ -1,5 +1,7 @@ +import { refractor } from "refractor/core"; import Storage from "../../utils/Storage"; import { + codeLanguages, getRefractorLangForLanguage, getLabelForLanguage, setRecentlyUsedCodeLanguage, @@ -20,6 +22,19 @@ describe("getRefractorLangForLanguage", () => { }); }); +describe("codeLanguages", () => { + it("should load and register a syntax for every language", async () => { + for (const { lang, loader } of Object.values(codeLanguages)) { + if (!loader) { + continue; + } + refractor.register(await loader()); + expect(refractor.registered(lang)).toBe(true); + expect(refractor.highlight("x", lang).type).toBe("root"); + } + }); +}); + describe("getLabelForLanguage", () => { it("should return the correct human-readable label for a given language", () => { expect(getLabelForLanguage("javascript")).toBe("JavaScript"); diff --git a/shared/editor/lib/code.ts b/shared/editor/lib/code.ts index cff75850a9..11a97534cc 100644 --- a/shared/editor/lib/code.ts +++ b/shared/editor/lib/code.ts @@ -1,4 +1,4 @@ -import type { RefractorSyntax } from "refractor"; +import type { Syntax } from "refractor"; import { FrequencyTracker } from "../../utils/FrequencyTracker"; /** @@ -10,7 +10,7 @@ type CodeLanguage = { /** The human-readable label shown in the language selector. */ label: string; /** Lazily loads the Refractor syntax definition for the language. */ - loader?: () => Promise; + loader?: () => Promise; /** * Whether this entry is a backwards-compatible alias for another language. * Aliases remain resolvable for existing documents but are hidden from the @@ -31,318 +31,318 @@ export const codeLanguages: Record = { abap: { lang: "abap", label: "ABAP", - loader: () => import("refractor/lang/abap").then((m) => m.default), + loader: () => import("refractor/abap").then((m) => m.default), }, bash: { lang: "bash", label: "Bash", - loader: () => import("refractor/lang/bash").then((m) => m.default), + loader: () => import("refractor/bash").then((m) => m.default), }, clike: { lang: "clike", label: "C", - loader: () => import("refractor/lang/clike").then((m) => m.default), + loader: () => import("refractor/clike").then((m) => m.default), }, cpp: { lang: "cpp", label: "C++", - loader: () => import("refractor/lang/cpp").then((m) => m.default), + loader: () => import("refractor/cpp").then((m) => m.default), }, csharp: { lang: "csharp", label: "C#", - loader: () => import("refractor/lang/csharp").then((m) => m.default), + loader: () => import("refractor/csharp").then((m) => m.default), }, css: { lang: "css", label: "CSS", - loader: () => import("refractor/lang/css").then((m) => m.default), + loader: () => import("refractor/css").then((m) => m.default), }, csv: { lang: "csv", label: "CSV", - loader: () => import("refractor/lang/csv").then((m) => m.default), + loader: () => import("refractor/csv").then((m) => m.default), }, dart: { lang: "dart", label: "Dart", - loader: () => import("refractor/lang/dart").then((m) => m.default), + loader: () => import("refractor/dart").then((m) => m.default), }, diff: { lang: "diff", label: "Diff", - loader: () => import("refractor/lang/diff").then((m) => m.default), + loader: () => import("refractor/diff").then((m) => m.default), }, docker: { lang: "docker", label: "Docker", - loader: () => import("refractor/lang/docker").then((m) => m.default), + loader: () => import("refractor/docker").then((m) => m.default), }, elixir: { lang: "elixir", label: "Elixir", - loader: () => import("refractor/lang/elixir").then((m) => m.default), + loader: () => import("refractor/elixir").then((m) => m.default), }, erb: { lang: "erb", label: "ERB", - loader: () => import("refractor/lang/erb").then((m) => m.default), + loader: () => import("refractor/erb").then((m) => m.default), }, erlang: { lang: "erlang", label: "Erlang", - loader: () => import("refractor/lang/erlang").then((m) => m.default), + loader: () => import("refractor/erlang").then((m) => m.default), }, fortran: { lang: "fortran", label: "Fortran", - loader: () => import("refractor/lang/fortran").then((m) => m.default), + loader: () => import("refractor/fortran").then((m) => m.default), }, go: { lang: "go", label: "Go", - loader: () => import("refractor/lang/go").then((m) => m.default), + loader: () => import("refractor/go").then((m) => m.default), }, graphql: { lang: "graphql", label: "GraphQL", - loader: () => import("refractor/lang/graphql").then((m) => m.default), + loader: () => import("refractor/graphql").then((m) => m.default), }, groovy: { lang: "groovy", label: "Groovy", - loader: () => import("refractor/lang/groovy").then((m) => m.default), + loader: () => import("refractor/groovy").then((m) => m.default), }, haskell: { lang: "haskell", label: "Haskell", - loader: () => import("refractor/lang/haskell").then((m) => m.default), + loader: () => import("refractor/haskell").then((m) => m.default), }, hcl: { lang: "hcl", label: "HCL", - loader: () => import("refractor/lang/hcl").then((m) => m.default), + loader: () => import("refractor/hcl").then((m) => m.default), }, markup: { lang: "markup", label: "HTML", - loader: () => import("refractor/lang/markup").then((m) => m.default), + loader: () => import("refractor/markup").then((m) => m.default), }, ini: { lang: "ini", label: "INI", - loader: () => import("refractor/lang/ini").then((m) => m.default), + loader: () => import("refractor/ini").then((m) => m.default), }, java: { lang: "java", label: "Java", - loader: () => import("refractor/lang/java").then((m) => m.default), + loader: () => import("refractor/java").then((m) => m.default), }, javascript: { lang: "javascript", label: "JavaScript", - loader: () => import("refractor/lang/javascript").then((m) => m.default), + loader: () => import("refractor/javascript").then((m) => m.default), }, json: { lang: "json", label: "JSON", - loader: () => import("refractor/lang/json").then((m) => m.default), + loader: () => import("refractor/json").then((m) => m.default), }, jsx: { lang: "jsx", label: "JSX", - loader: () => import("refractor/lang/jsx").then((m) => m.default), + loader: () => import("refractor/jsx").then((m) => m.default), }, kotlin: { lang: "kotlin", label: "Kotlin", - loader: () => import("refractor/lang/kotlin").then((m) => m.default), + loader: () => import("refractor/kotlin").then((m) => m.default), }, kusto: { lang: "kusto", label: "Kusto", - loader: () => import("refractor/lang/kusto").then((m) => m.default), + loader: () => import("refractor/kusto").then((m) => m.default), }, lisp: { lang: "lisp", label: "Lisp", - loader: () => import("refractor/lang/lisp").then((m) => m.default), + loader: () => import("refractor/lisp").then((m) => m.default), }, lua: { lang: "lua", label: "Lua", - loader: () => import("refractor/lang/lua").then((m) => m.default), + loader: () => import("refractor/lua").then((m) => m.default), }, makefile: { lang: "makefile", label: "Makefile", - loader: () => import("refractor/lang/makefile").then((m) => m.default), + loader: () => import("refractor/makefile").then((m) => m.default), }, markdown: { lang: "markdown", label: "Markdown", - loader: () => import("refractor/lang/markdown").then((m) => m.default), + loader: () => import("refractor/markdown").then((m) => m.default), }, mermaid: { lang: "mermaid", label: "Mermaid", - loader: () => import("refractor/lang/mermaid").then((m) => m.default), + loader: () => import("refractor/mermaid").then((m) => m.default), }, mermaidjs: { lang: "mermaid", label: "Mermaid", alias: true, - loader: () => import("refractor/lang/mermaid").then((m) => m.default), + loader: () => import("refractor/mermaid").then((m) => m.default), }, nginx: { lang: "nginx", label: "Nginx", - loader: () => import("refractor/lang/nginx").then((m) => m.default), + loader: () => import("refractor/nginx").then((m) => m.default), }, nix: { lang: "nix", label: "Nix", - loader: () => import("refractor/lang/nix").then((m) => m.default), + loader: () => import("refractor/nix").then((m) => m.default), }, objectivec: { lang: "objectivec", label: "Objective-C", - loader: () => import("refractor/lang/objectivec").then((m) => m.default), + loader: () => import("refractor/objectivec").then((m) => m.default), }, ocaml: { lang: "ocaml", label: "OCaml", - loader: () => import("refractor/lang/ocaml").then((m) => m.default), + loader: () => import("refractor/ocaml").then((m) => m.default), }, perl: { lang: "perl", label: "Perl", - loader: () => import("refractor/lang/perl").then((m) => m.default), + loader: () => import("refractor/perl").then((m) => m.default), }, php: { lang: "php", label: "PHP", - loader: () => import("refractor/lang/php").then((m) => m.default), + loader: () => import("refractor/php").then((m) => m.default), }, powershell: { lang: "powershell", label: "PowerShell", - loader: () => import("refractor/lang/powershell").then((m) => m.default), + loader: () => import("refractor/powershell").then((m) => m.default), }, promql: { lang: "promql", label: "PromQL", - loader: () => import("refractor/lang/promql").then((m) => m.default), + loader: () => import("refractor/promql").then((m) => m.default), }, protobuf: { lang: "protobuf", label: "Protobuf", - loader: () => import("refractor/lang/protobuf").then((m) => m.default), + loader: () => import("refractor/protobuf").then((m) => m.default), }, python: { lang: "python", label: "Python", - loader: () => import("refractor/lang/python").then((m) => m.default), + loader: () => import("refractor/python").then((m) => m.default), }, r: { lang: "r", label: "R", - loader: () => import("refractor/lang/r").then((m) => m.default), + loader: () => import("refractor/r").then((m) => m.default), }, regex: { lang: "regex", label: "Regex", - loader: () => import("refractor/lang/regex").then((m) => m.default), + loader: () => import("refractor/regex").then((m) => m.default), }, ruby: { lang: "ruby", label: "Ruby", - loader: () => import("refractor/lang/ruby").then((m) => m.default), + loader: () => import("refractor/ruby").then((m) => m.default), }, rust: { lang: "rust", label: "Rust", - loader: () => import("refractor/lang/rust").then((m) => m.default), + loader: () => import("refractor/rust").then((m) => m.default), }, scala: { lang: "scala", label: "Scala", - loader: () => import("refractor/lang/scala").then((m) => m.default), + loader: () => import("refractor/scala").then((m) => m.default), }, sass: { lang: "sass", label: "Sass", - loader: () => import("refractor/lang/sass").then((m) => m.default), + loader: () => import("refractor/sass").then((m) => m.default), }, scss: { lang: "scss", label: "SCSS", - loader: () => import("refractor/lang/scss").then((m) => m.default), + loader: () => import("refractor/scss").then((m) => m.default), }, "splunk-spl": { lang: "splunk-spl", label: "Splunk SPL", - loader: () => import("refractor/lang/splunk-spl").then((m) => m.default), + loader: () => import("refractor/splunk-spl").then((m) => m.default), }, sql: { lang: "sql", label: "SQL", - loader: () => import("refractor/lang/sql").then((m) => m.default), + loader: () => import("refractor/sql").then((m) => m.default), }, solidity: { lang: "solidity", label: "Solidity", - loader: () => import("refractor/lang/solidity").then((m) => m.default), + loader: () => import("refractor/solidity").then((m) => m.default), }, swift: { lang: "swift", label: "Swift", - loader: () => import("refractor/lang/swift").then((m) => m.default), + loader: () => import("refractor/swift").then((m) => m.default), }, toml: { lang: "toml", label: "TOML", - loader: () => import("refractor/lang/toml").then((m) => m.default), + loader: () => import("refractor/toml").then((m) => m.default), }, tsx: { lang: "tsx", label: "TSX", - loader: () => import("refractor/lang/tsx").then((m) => m.default), + loader: () => import("refractor/tsx").then((m) => m.default), }, typescript: { lang: "typescript", label: "TypeScript", - loader: () => import("refractor/lang/typescript").then((m) => m.default), + loader: () => import("refractor/typescript").then((m) => m.default), }, vb: { lang: "vbnet", label: "Visual Basic", - loader: () => import("refractor/lang/vbnet").then((m) => m.default), + loader: () => import("refractor/vbnet").then((m) => m.default), }, verilog: { lang: "verilog", label: "Verilog", - loader: () => import("refractor/lang/verilog").then((m) => m.default), + loader: () => import("refractor/verilog").then((m) => m.default), }, vhdl: { lang: "vhdl", label: "VHDL", - loader: () => import("refractor/lang/vhdl").then((m) => m.default), + loader: () => import("refractor/vhdl").then((m) => m.default), }, yaml: { lang: "yaml", label: "YAML", - loader: () => import("refractor/lang/yaml").then((m) => m.default), + loader: () => import("refractor/yaml").then((m) => m.default), }, xml: { lang: "markup", label: "XML", - loader: () => import("refractor/lang/markup").then((m) => m.default), + loader: () => import("refractor/markup").then((m) => m.default), }, zig: { lang: "zig", label: "Zig", - loader: () => import("refractor/lang/zig").then((m) => m.default), + loader: () => import("refractor/zig").then((m) => m.default), }, }; diff --git a/shared/editor/plugins/CodeHighlightingPlugin.ts b/shared/editor/plugins/CodeHighlightingPlugin.ts index 0fdddbd427..cef9e3a87f 100644 --- a/shared/editor/plugins/CodeHighlightingPlugin.ts +++ b/shared/editor/plugins/CodeHighlightingPlugin.ts @@ -2,7 +2,7 @@ import type { Node } from "prosemirror-model"; import type { Transaction } from "prosemirror-state"; import { Plugin, PluginKey } from "prosemirror-state"; import { Decoration, DecorationSet } from "prosemirror-view"; -import type refractorType from "refractor/core"; +import type { Refractor } from "refractor/core"; import { getLoaderForLanguage, getRefractorLangForLanguage } from "../lib/code"; import { EditorStyleHelper } from "../styles/EditorStyleHelper"; @@ -38,11 +38,14 @@ const languagePromises: Record< Promise | undefined > = {}; -let refractor: typeof refractorType | undefined; +/** A node in the tree returned by refractor. */ +type RefractorNode = ReturnType["children"][number]; + +let refractor: Refractor | undefined; /** Lazily load refractor core. */ async function getRefractor() { - refractor ??= (await import("refractor/core")).default; + refractor ??= (await import("refractor/core")).refractor; return refractor; } @@ -151,7 +154,7 @@ function lineNumberDecorations({ node, pos }: CodeBlock): Decoration[] { * @returns the accumulated tokens and current offset. */ function parseNodes( - nodes: refractorType.RefractorNode[], + nodes: RefractorNode[], classNames: string[] = [], state: { tokens: TokenRange[]; offset: number } = { tokens: [], offset: 0 } ) { @@ -164,6 +167,9 @@ function parseNodes( ); continue; } + if (node.type !== "text") { + continue; + } const from = state.offset; state.offset += node.value.length; @@ -262,7 +268,9 @@ export function CodeHighlighting({ return; } - const { tokens } = parseNodes(refractor.highlight(node.textContent, lang)); + const { tokens } = parseNodes( + refractor.highlight(node.textContent, lang).children + ); tokenCache.set(node, tokens); return tokens; } diff --git a/shared/typings/refractor.d.ts b/shared/typings/refractor.d.ts deleted file mode 100644 index 91de26948d..0000000000 --- a/shared/typings/refractor.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -// Languages bundled with refractor that are missing from @types/refractor. -declare module "refractor/lang/kusto" { - import type { RefractorSyntax } from "refractor/core"; - const lang: RefractorSyntax; - export default lang; -} - -declare module "refractor/lang/mermaid" { - import type { RefractorSyntax } from "refractor/core"; - const lang: RefractorSyntax; - export default lang; -} - -declare module "refractor/lang/promql" { - import type { RefractorSyntax } from "refractor/core"; - const lang: RefractorSyntax; - export default lang; -} diff --git a/tsconfig.json b/tsconfig.json index 2413f02a83..bd02de51cb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -38,7 +38,10 @@ // resolvePackageJsonExports disables; point tsc at their declaration entries. "vite": ["./node_modules/vite/dist/node/index.d.ts"], "@vitejs/plugin-react": ["./node_modules/@vitejs/plugin-react/dist/index.d.ts"], - "pele/lazy": ["./node_modules/pele/dist/lazy.d.ts"] + "pele/lazy": ["./node_modules/pele/dist/lazy.d.ts"], + "refractor": ["./node_modules/refractor/lib/common.d.ts"], + "refractor/core": ["./node_modules/refractor/lib/core.d.ts"], + "refractor/*": ["./node_modules/refractor/lang/*.d.ts"] } }, "exclude": ["node_modules", "build", "server/migrations"] diff --git a/yarn.lock b/yarn.lock index 855318eff2..484f8b0dba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6243,12 +6243,12 @@ __metadata: languageName: node linkType: hard -"@types/hast@npm:^2.0.0": - version: 2.3.10 - resolution: "@types/hast@npm:2.3.10" +"@types/hast@npm:^3.0.0": + version: 3.0.5 + resolution: "@types/hast@npm:3.0.5" dependencies: - "@types/unist": "npm:^2" - checksum: 10c0/16daac35d032e656defe1f103f9c09c341a6dc553c7ec17b388274076fa26e904a71ea5ea41fd368a6d5f1e9e53be275c80af7942b9c466d8511d261c9529c7e + "@types/unist": "npm:*" + checksum: 10c0/f3af8594a6903a507ed191eda944af18099198d6708c29102ae17118c3e20779f6929e91ed37e033541fd28d58055d8a5910a4366dbdf976cf81b13a464741fb languageName: node linkType: hard @@ -6560,10 +6560,10 @@ __metadata: languageName: node linkType: hard -"@types/prismjs@npm:*": - version: 1.26.5 - resolution: "@types/prismjs@npm:1.26.5" - checksum: 10c0/5619cb449e0d8df098c8759d6f47bf8fdd510abf5dbdfa999e55c6a2545efbd1e209cc85a33d8d9f4ff2898089a1a6d9a70737c9baffaae635c46852c40d384a +"@types/prismjs@npm:^1.0.0": + version: 1.26.6 + resolution: "@types/prismjs@npm:1.26.6" + checksum: 10c0/152a27500cb32b114edfb77f9d0dccd03bebc84828d1e92abacaf212b22d3ccdde041ce421dd58b6ec8461bbec7cd76ed5ee773cae4be7ca36a6dd4ddcf0f9e7 languageName: node linkType: hard @@ -6652,15 +6652,6 @@ __metadata: languageName: node linkType: hard -"@types/refractor@npm:^3.4.1": - version: 3.4.1 - resolution: "@types/refractor@npm:3.4.1" - dependencies: - "@types/prismjs": "npm:*" - checksum: 10c0/c8d74657f912266b7df1b4c0d598ca766f0df3ee86347f6b26354d67768ab33a7a64052c3e27464c92f58159215f6a56df7d2ba722050a967d3d22ccabd78fe8 - languageName: node - linkType: hard - "@types/resolve-path@npm:^1.4.3": version: 1.4.3 resolution: "@types/resolve-path@npm:1.4.3" @@ -6759,7 +6750,14 @@ __metadata: languageName: node linkType: hard -"@types/unist@npm:^2": +"@types/unist@npm:*": + version: 3.0.3 + resolution: "@types/unist@npm:3.0.3" + checksum: 10c0/2b1e4adcab78388e088fcc3c0ae8700f76619dbcb4741d7d201f87e2cb346bfc29a89003cfea2d76c996e1061452e14fcd737e8b25aacf949c1f2d6b2bc3dd60 + languageName: node + linkType: hard + +"@types/unist@npm:^2.0.0": version: 2.0.11 resolution: "@types/unist@npm:2.0.11" checksum: 10c0/24dcdf25a168f453bb70298145eb043cfdbb82472db0bc0b56d6d51cd2e484b9ed8271d4ac93000a80da568f2402e9339723db262d0869e2bf13bc58e081768d @@ -8100,24 +8098,24 @@ __metadata: languageName: node linkType: hard -"character-entities-legacy@npm:^1.0.0": - version: 1.1.4 - resolution: "character-entities-legacy@npm:1.1.4" - checksum: 10c0/ea4ca9c29887335eed86d78fc67a640168342b1274da84c097abb0575a253d1265281a5052f9a863979e952bcc267b4ecaaf4fe233a7e1e0d8a47806c65b96c7 +"character-entities-legacy@npm:^3.0.0": + version: 3.0.0 + resolution: "character-entities-legacy@npm:3.0.0" + checksum: 10c0/ec4b430af873661aa754a896a2b55af089b4e938d3d010fad5219299a6b6d32ab175142699ee250640678cd64bdecd6db3c9af0b8759ab7b155d970d84c4c7d1 languageName: node linkType: hard -"character-entities@npm:^1.0.0": - version: 1.2.4 - resolution: "character-entities@npm:1.2.4" - checksum: 10c0/ad015c3d7163563b8a0ee1f587fb0ef305ef344e9fd937f79ca51cccc233786a01d591d989d5bf7b2e66b528ac9efba47f3b1897358324e69932f6d4b25adfe1 +"character-entities@npm:^2.0.0": + version: 2.0.2 + resolution: "character-entities@npm:2.0.2" + checksum: 10c0/b0c645a45bcc90ff24f0e0140f4875a8436b8ef13b6bcd31ec02cfb2ca502b680362aa95386f7815bdc04b6464d48cf191210b3840d7c04241a149ede591a308 languageName: node linkType: hard -"character-reference-invalid@npm:^1.0.0": - version: 1.1.4 - resolution: "character-reference-invalid@npm:1.1.4" - checksum: 10c0/29f05081c5817bd1e975b0bf61e77b60a40f62ad371d0f0ce0fdb48ab922278bc744d1fbe33771dced751887a8403f265ff634542675c8d7375f6ff4811efd0e +"character-reference-invalid@npm:^2.0.0": + version: 2.0.1 + resolution: "character-reference-invalid@npm:2.0.1" + checksum: 10c0/2ae0dec770cd8659d7e8b0ce24392d83b4c2f0eb4a3395c955dce5528edd4cc030a794cfa06600fcdd700b3f2de2f9b8e40e309c0011c4180e3be64a0b42e6a1 languageName: node linkType: hard @@ -8381,10 +8379,10 @@ __metadata: languageName: node linkType: hard -"comma-separated-tokens@npm:^1.0.0": - version: 1.0.8 - resolution: "comma-separated-tokens@npm:1.0.8" - checksum: 10c0/c3bcfeaa6d50313528a006a40bcc0f9576086665c9b48d4b3a76ddd63e7d6174734386c98be1881cbf6ecfc25e1db61cd775a7b896d2ea7a65de28f83a0f9b17 +"comma-separated-tokens@npm:^2.0.0": + version: 2.0.3 + resolution: "comma-separated-tokens@npm:2.0.3" + checksum: 10c0/91f90f1aae320f1755d6957ef0b864fe4f54737f3313bd95e0802686ee2ca38bff1dd381964d00ae5db42912dd1f4ae5c2709644e82706ffc6f6842a813cdd67 languageName: node linkType: hard @@ -9001,6 +8999,15 @@ __metadata: languageName: node linkType: hard +"decode-named-character-reference@npm:^1.0.0": + version: 1.3.0 + resolution: "decode-named-character-reference@npm:1.3.0" + dependencies: + character-entities: "npm:^2.0.0" + checksum: 10c0/787f4c87f3b82ea342aa7c2d7b1882b6fb9511bb77f72ae44dcaabea0470bacd1e9c6a0080ab886545019fa0cb3a7109573fad6b61a362844c3a0ac52b36e4bb + languageName: node + linkType: hard + "decode-uri-component@npm:^0.5.0": version: 0.5.0 resolution: "decode-uri-component@npm:0.5.0" @@ -10954,23 +10961,25 @@ __metadata: languageName: node linkType: hard -"hast-util-parse-selector@npm:^2.0.0": - version: 2.2.5 - resolution: "hast-util-parse-selector@npm:2.2.5" - checksum: 10c0/29b7ee77960ded6a99d30c287d922243071cc07b39f2006f203bd08ee54eb8f66bdaa86ef6527477c766e2382d520b60ee4e4087f189888c35d8bcc020173648 +"hast-util-parse-selector@npm:^4.0.0": + version: 4.0.0 + resolution: "hast-util-parse-selector@npm:4.0.0" + dependencies: + "@types/hast": "npm:^3.0.0" + checksum: 10c0/5e98168cb44470dc274aabf1a28317e4feb09b1eaf7a48bbaa8c1de1b43a89cd195cb1284e535698e658e3ec26ad91bc5e52c9563c36feb75abbc68aaf68fb9f languageName: node linkType: hard -"hastscript@npm:^6.0.0": - version: 6.0.0 - resolution: "hastscript@npm:6.0.0" +"hastscript@npm:^9.0.0": + version: 9.0.1 + resolution: "hastscript@npm:9.0.1" dependencies: - "@types/hast": "npm:^2.0.0" - comma-separated-tokens: "npm:^1.0.0" - hast-util-parse-selector: "npm:^2.0.0" - property-information: "npm:^5.0.0" - space-separated-tokens: "npm:^1.0.0" - checksum: 10c0/f76d9cf373cb075c8523c8ad52709f09f7e02b7c9d3152b8d35c65c265b9f1878bed6023f215a7d16523921036d40a7da292cb6f4399af9b5eccac2a5a5eb330 + "@types/hast": "npm:^3.0.0" + comma-separated-tokens: "npm:^2.0.0" + hast-util-parse-selector: "npm:^4.0.0" + property-information: "npm:^7.0.0" + space-separated-tokens: "npm:^2.0.0" + checksum: 10c0/18dc8064e5c3a7a2ae862978e626b97a254e1c8a67ee9d0c9f06d373bba155ed805fc5b5ce21b990fb7bc174624889e5e1ce1cade264f1b1d58b48f994bc85ce languageName: node linkType: hard @@ -11551,20 +11560,20 @@ __metadata: languageName: node linkType: hard -"is-alphabetical@npm:^1.0.0": - version: 1.0.4 - resolution: "is-alphabetical@npm:1.0.4" - checksum: 10c0/1505b1de5a1fd74022c05fb21b0e683a8f5229366bac8dc4d34cf6935bcfd104d1125a5e6b083fb778847629f76e5bdac538de5367bdf2b927a1356164e23985 +"is-alphabetical@npm:^2.0.0": + version: 2.0.1 + resolution: "is-alphabetical@npm:2.0.1" + checksum: 10c0/932367456f17237533fd1fc9fe179df77957271020b83ea31da50e5cc472d35ef6b5fb8147453274ffd251134472ce24eb6f8d8398d96dee98237cdb81a6c9a7 languageName: node linkType: hard -"is-alphanumerical@npm:^1.0.0": - version: 1.0.4 - resolution: "is-alphanumerical@npm:1.0.4" +"is-alphanumerical@npm:^2.0.0": + version: 2.0.1 + resolution: "is-alphanumerical@npm:2.0.1" dependencies: - is-alphabetical: "npm:^1.0.0" - is-decimal: "npm:^1.0.0" - checksum: 10c0/d623abae7130a7015c6bf33d99151d4e7005572fd170b86568ff4de5ae86ac7096608b87dd4a1d4dbbd497e392b6396930ba76c9297a69455909cebb68005905 + is-alphabetical: "npm:^2.0.0" + is-decimal: "npm:^2.0.0" + checksum: 10c0/4b35c42b18e40d41378293f82a3ecd9de77049b476f748db5697c297f686e1e05b072a6aaae2d16f54d2a57f85b00cbbe755c75f6d583d1c77d6657bd0feb5a2 languageName: node linkType: hard @@ -11669,10 +11678,10 @@ __metadata: languageName: node linkType: hard -"is-decimal@npm:^1.0.0": - version: 1.0.4 - resolution: "is-decimal@npm:1.0.4" - checksum: 10c0/a4ad53c4c5c4f5a12214e7053b10326711f6a71f0c63ba1314a77bd71df566b778e4ebd29f9fb6815f07a4dc50c3767fb19bd6fc9fa05e601410f1d64ffeac48 +"is-decimal@npm:^2.0.0": + version: 2.0.1 + resolution: "is-decimal@npm:2.0.1" + checksum: 10c0/8085dd66f7d82f9de818fba48b9e9c0429cb4291824e6c5f2622e96b9680b54a07a624cfc663b24148b8e853c62a1c987cfe8b0b5a13f5156991afaf6736e334 languageName: node linkType: hard @@ -11746,10 +11755,10 @@ __metadata: languageName: node linkType: hard -"is-hexadecimal@npm:^1.0.0": - version: 1.0.4 - resolution: "is-hexadecimal@npm:1.0.4" - checksum: 10c0/ec4c64e5624c0f240922324bc697e166554f09d3ddc7633fc526084502626445d0a871fbd8cae52a9844e83bd0bb414193cc5a66806d7b2867907003fc70c5ea +"is-hexadecimal@npm:^2.0.0": + version: 2.0.1 + resolution: "is-hexadecimal@npm:2.0.1" + checksum: 10c0/3eb60fe2f1e2bbc760b927dcad4d51eaa0c60138cf7fc671803f66353ad90c301605b502c7ea4c6bb0548e1c7e79dfd37b73b632652e3b76030bba603a7e9626 languageName: node linkType: hard @@ -14241,7 +14250,6 @@ __metadata: "@types/react-router-dom": "npm:^5.3.3" "@types/readable-stream": "npm:^4.0.24" "@types/redis-info": "npm:^3.0.3" - "@types/refractor": "npm:^3.4.1" "@types/resolve-path": "npm:^1.4.3" "@types/semver": "npm:^7.7.1" "@types/slug": "npm:^5.0.9" @@ -14381,7 +14389,7 @@ __metadata: react-zoom-pan-pinch: "npm:^3.7.0" redlock: "npm:^5.0.0-beta2" reflect-metadata: "npm:^0.2.2" - refractor: "npm:^3.6.0" + refractor: "npm:^5.0.0" resolve-path: "npm:^1.4.0" rimraf: "npm:^6.1.3" rollup-plugin-webpack-stats: "npm:^3.1.3" @@ -14802,17 +14810,18 @@ __metadata: languageName: node linkType: hard -"parse-entities@npm:^2.0.0": - version: 2.0.0 - resolution: "parse-entities@npm:2.0.0" +"parse-entities@npm:^4.0.0": + version: 4.0.2 + resolution: "parse-entities@npm:4.0.2" dependencies: - character-entities: "npm:^1.0.0" - character-entities-legacy: "npm:^1.0.0" - character-reference-invalid: "npm:^1.0.0" - is-alphanumerical: "npm:^1.0.0" - is-decimal: "npm:^1.0.0" - is-hexadecimal: "npm:^1.0.0" - checksum: 10c0/f85a22c0ea406ff26b53fdc28641f01cc36fa49eb2e3135f02693286c89ef0bcefc2262d99b3688e20aac2a14fd10b75c518583e875c1b9fe3d1f937795e0854 + "@types/unist": "npm:^2.0.0" + character-entities-legacy: "npm:^3.0.0" + character-reference-invalid: "npm:^2.0.0" + decode-named-character-reference: "npm:^1.0.0" + is-alphanumerical: "npm:^2.0.0" + is-decimal: "npm:^2.0.0" + is-hexadecimal: "npm:^2.0.0" + checksum: 10c0/a13906b1151750b78ed83d386294066daf5fb559e08c5af9591b2d98cc209123103016a01df776f65f8219ad26652d6d6b210d0974d452049cddfc53a8916c34 languageName: node linkType: hard @@ -15403,13 +15412,6 @@ __metadata: languageName: node linkType: hard -"prismjs@npm:1.30.0": - version: 1.30.0 - resolution: "prismjs@npm:1.30.0" - checksum: 10c0/f56205bfd58ef71ccfcbcb691fd0eb84adc96c6ff21b0b69fc6fdcf02be42d6ef972ba4aed60466310de3d67733f6a746f89f2fb79c00bf217406d465b3e8f23 - languageName: node - linkType: hard - "proc-log@npm:^6.0.0": version: 6.1.0 resolution: "proc-log@npm:6.1.0" @@ -15459,12 +15461,10 @@ __metadata: languageName: node linkType: hard -"property-information@npm:^5.0.0": - version: 5.6.0 - resolution: "property-information@npm:5.6.0" - dependencies: - xtend: "npm:^4.0.0" - checksum: 10c0/d54b77c31dc13bb6819559080b2c67d37d94be7dc271f404f139a16a57aa96fcc0b3ad806d4a5baef9e031744853e4afe3df2e37275aacb1f78079bbb652c5af +"property-information@npm:^7.0.0": + version: 7.2.0 + resolution: "property-information@npm:7.2.0" + checksum: 10c0/03662c8f9e1544510914c5e594ae72963f67d261027a5fdc06c4134742584fe40dd49b959470d30e757e9fb70b297d8546ab1362a040364144029926ad4e07c4 languageName: node linkType: hard @@ -16144,14 +16144,15 @@ __metadata: languageName: node linkType: hard -"refractor@npm:^3.6.0": - version: 3.6.0 - resolution: "refractor@npm:3.6.0" +"refractor@npm:^5.0.0": + version: 5.0.0 + resolution: "refractor@npm:5.0.0" dependencies: - hastscript: "npm:^6.0.0" - parse-entities: "npm:^2.0.0" - prismjs: "npm:~1.27.0" - checksum: 10c0/63ab62393c8c2fd7108c2ea1eff721c0ad2a1a6eee60fdd1b47f4bb25cf298667dc97d041405b3e718b0817da12b37a86ed07ebee5bd2ca6405611f1bae456db + "@types/hast": "npm:^3.0.0" + "@types/prismjs": "npm:^1.0.0" + hastscript: "npm:^9.0.0" + parse-entities: "npm:^4.0.0" + checksum: 10c0/7b69a3b525f88de4adae3467f30ff7e80513fa53e65d85656f169ded16e314f471dfa936ccc545ae604e178ee7a108cbd94e6144a5bd541ed8d20626cc75e7b8 languageName: node linkType: hard @@ -17338,10 +17339,10 @@ __metadata: languageName: node linkType: hard -"space-separated-tokens@npm:^1.0.0": - version: 1.1.5 - resolution: "space-separated-tokens@npm:1.1.5" - checksum: 10c0/3ee0a6905f89e1ffdfe474124b1ade9fe97276a377a0b01350bc079b6ec566eb5b219e26064cc5b7f3899c05bde51ffbc9154290b96eaf82916a1e2c2c13ead9 +"space-separated-tokens@npm:^2.0.0": + version: 2.0.2 + resolution: "space-separated-tokens@npm:2.0.2" + checksum: 10c0/6173e1d903dca41dcab6a2deed8b4caf61bd13b6d7af8374713500570aa929ff9414ae09a0519f4f8772df993300305a395d4871f35bc4ca72b6db57e1f30af8 languageName: node linkType: hard