diff --git a/package.json b/package.json index 66d2a36f3a..0b3d670d63 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "is-hotkey": "^0.2.0", "jwt-decode": "^4.0.0", "lodash-es": "^4.17.23", - "monaco-editor": "0.47.0", + "monaco-editor": "0.55.1", "nanoid": "^5.1.2", "open-graph-scraper": "^6.11.0", "openapi-fetch": "^0.15.0", diff --git a/src/components/MonacoEditor/MonacoEditor.tsx b/src/components/MonacoEditor/MonacoEditor.tsx index 3b6b4778b5..53dcfa9fd1 100644 --- a/src/components/MonacoEditor/MonacoEditor.tsx +++ b/src/components/MonacoEditor/MonacoEditor.tsx @@ -7,20 +7,20 @@ */ import { styled } from "@ndla/styled-system/jsx"; -import "monaco-editor/esm/vs/editor/browser/coreCommands"; -import "monaco-editor/esm/vs/editor/contrib/find/browser/findController"; -import "monaco-editor/esm/vs/language/html/monaco.contribution"; -import "monaco-editor/esm/vs/basic-languages/html/html.contribution"; -import "monaco-editor/esm/vs/editor/contrib/bracketMatching/browser/bracketMatching"; -import "monaco-editor/esm/vs/editor/contrib/links/browser/links"; -import "monaco-editor/esm/vs/editor/contrib/suggest/browser/suggestController"; -import "monaco-editor/esm/vs/editor/contrib/wordHighlighter/browser/wordHighlighter"; -import "monaco-editor/esm/vs/editor/standalone/browser/quickAccess/standaloneCommandsQuickAccess"; -import "monaco-editor/esm/vs/editor/contrib/fontZoom/browser/fontZoom"; -import "monaco-editor/esm/vs/editor/contrib/linesOperations/browser/linesOperations"; -import "monaco-editor/esm/vs/editor/contrib/multicursor/browser/multicursor"; -import * as monaco from "monaco-editor/esm/vs/editor/editor.api"; -import htmlWorker from "monaco-editor/esm/vs/language/html/html.worker?worker"; +import "monaco-editor/esm/vs/editor/browser/coreCommands.js"; +import "monaco-editor/esm/vs/editor/contrib/find/browser/findController.js"; +import "monaco-editor/esm/vs/language/html/monaco.contribution.js"; +import "monaco-editor/esm/vs/basic-languages/html/html.contribution.js"; +import "monaco-editor/esm/vs/editor/contrib/bracketMatching/browser/bracketMatching.js"; +import "monaco-editor/esm/vs/editor/contrib/links/browser/links.js"; +import "monaco-editor/esm/vs/editor/contrib/suggest/browser/suggestController.js"; +import "monaco-editor/esm/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.js"; +import "monaco-editor/esm/vs/editor/standalone/browser/quickAccess/standaloneCommandsQuickAccess.js"; +import "monaco-editor/esm/vs/editor/contrib/fontZoom/browser/fontZoom.js"; +import "monaco-editor/esm/vs/editor/contrib/linesOperations/browser/linesOperations.js"; +import "monaco-editor/esm/vs/editor/contrib/multicursor/browser/multicursor.js"; +import * as monaco from "monaco-editor/esm/vs/editor/editor.api.js"; +import htmlWorker from "monaco-editor/esm/vs/language/html/html.worker.js?worker"; // Uncomment the following line to test all monaco-editor features // import * as monaco from "monaco-editor"; import { useEffect, useRef, useState } from "react"; diff --git a/src/components/MonacoEditor/editorActions.ts b/src/components/MonacoEditor/editorActions.ts index 4971ff9cbc..6e2c9a9c0d 100644 --- a/src/components/MonacoEditor/editorActions.ts +++ b/src/components/MonacoEditor/editorActions.ts @@ -6,7 +6,7 @@ * */ -import { editor, KeyMod, KeyCode } from "monaco-editor/esm/vs/editor/editor.api"; +import { editor, KeyMod, KeyCode } from "monaco-editor/esm/vs/editor/editor.api.js"; export const createFormatAction = (): editor.IActionDescriptor => { return { diff --git a/yarn.lock b/yarn.lock index dc5bb3a1bd..e27cf5303e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4124,6 +4124,13 @@ __metadata: languageName: node linkType: hard +"@types/trusted-types@npm:^2.0.7": + version: 2.0.7 + resolution: "@types/trusted-types@npm:2.0.7" + checksum: 10c0/4c4855f10de7c6c135e0d32ce462419d8abbbc33713b31d294596c0cc34ae1fa6112a2f9da729c8f7a20707782b0d69da3b1f8df6645b0366d08825ca1522e0c + languageName: node + linkType: hard + "@typescript-eslint/eslint-plugin@npm:8.54.0": version: 8.54.0 resolution: "@typescript-eslint/eslint-plugin@npm:8.54.0" @@ -6514,6 +6521,18 @@ __metadata: languageName: node linkType: hard +"dompurify@npm:3.2.7": + version: 3.2.7 + resolution: "dompurify@npm:3.2.7" + dependencies: + "@types/trusted-types": "npm:^2.0.7" + dependenciesMeta: + "@types/trusted-types": + optional: true + checksum: 10c0/d41bb31a72f1acdf9b84c56723c549924b05d92a39a15bd8c40bec9007ff80d5fccf844bc53ee12af5b69044f9a7ce24a1e71c267a4f49cf38711379ed8c1363 + languageName: node + linkType: hard + "domutils@npm:^3.0.1, domutils@npm:^3.2.1, domutils@npm:^3.2.2": version: 3.2.2 resolution: "domutils@npm:3.2.2" @@ -6629,7 +6648,7 @@ __metadata: jsdom: "npm:^28.0.0" jwt-decode: "npm:^4.0.0" lodash-es: "npm:^4.17.23" - monaco-editor: "npm:0.47.0" + monaco-editor: "npm:0.55.1" nanoid: "npm:^5.1.2" nock: "npm:^14.0.10" open-graph-scraper: "npm:^6.11.0" @@ -9206,6 +9225,15 @@ __metadata: languageName: node linkType: hard +"marked@npm:14.0.0": + version: 14.0.0 + resolution: "marked@npm:14.0.0" + bin: + marked: bin/marked.js + checksum: 10c0/57a47cb110f7b1a10f398b0a7236f9183aad2dcd5345ee73f2732b6387e585d04cef472bc655d2f84c542296be9728e179aebe3ed7f2f8666b8a0a9dae592876 + languageName: node + linkType: hard + "math-intrinsics@npm:^1.1.0": version: 1.1.0 resolution: "math-intrinsics@npm:1.1.0" @@ -9416,10 +9444,13 @@ __metadata: languageName: node linkType: hard -"monaco-editor@npm:0.47.0": - version: 0.47.0 - resolution: "monaco-editor@npm:0.47.0" - checksum: 10c0/bbe4fc284a7803e4ed0fa69b6e31c41ef6f5d259722e8a876ce2850b7139e68eff3a6435306e11eff848db8662b818e40f9cafc6f7a53d4a4551fed362d5dc02 +"monaco-editor@npm:0.55.1": + version: 0.55.1 + resolution: "monaco-editor@npm:0.55.1" + dependencies: + dompurify: "npm:3.2.7" + marked: "npm:14.0.0" + checksum: 10c0/c1a0cf887657b42c8996518bc5ee96bbd39c977f862d2a2b2018427c45f14b0dd25d1452278202056f6b1ead97981282ccacd7d7ad918d8f0ef084159f974a25 languageName: node linkType: hard