From 17d820c1c6d19dda8531c3ad9ecf9c604689fa14 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 20 Oct 2026 03:10:53 +0000 Subject: [PATCH 1/2] Update dependency monaco-editor to v0.57.0 --- dor-tools-builtin/package.json | 2 +- pnpm-lock.yaml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dor-tools-builtin/package.json b/dor-tools-builtin/package.json index 1c0a62057..69f847817 100644 --- a/dor-tools-builtin/package.json +++ b/dor-tools-builtin/package.json @@ -27,7 +27,7 @@ "dor-tools-lib": "workspace:*", "lexical": "0.48.0", "mermaid": "11.17.2", - "monaco-editor": "0.55.1", + "monaco-editor": "0.57.0", "react": "^19.3.0", "react-dom": "^19.3.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5c60a6f17..ef8b125fe 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -296,8 +296,8 @@ importers: specifier: 11.17.2 version: 11.17.2 monaco-editor: - specifier: 0.55.1 - version: 0.55.1 + specifier: 0.57.0 + version: 0.57.0 react: specifier: ^19.3.0 version: 19.3.1 @@ -5570,8 +5570,8 @@ packages: resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==} engines: {node: '>= 4'} - dompurify@3.2.7: - resolution: {integrity: sha512-WhL/YuveyGXJaerVlMYGWhvQswa7myDG17P7Vu65EWC05o8vfeNbvNf4d/BOvH99+ZW+LlQsc1GDKMa1vNK6dw==} + dompurify@3.4.15: + resolution: {integrity: sha512-EUBjM+B+lkDE41iE82DDSCfkoPGfXx8IxFxPMjNzm/Uk4xDet77rTN9wqlxlVg71kK7XGuUMv6wUxJUwwv+Xyw==} dompurify@3.4.16: resolution: {integrity: sha512-sqo+pNp3qRhCIpbgRi1y8Tgk27Bo2Ry7w0dC1NBeNTdZChWjz9Xb/KOoZbRP/R6pQZ80Qw8YhXw13hWWBbMRnQ==} @@ -6726,8 +6726,8 @@ packages: engines: {node: '>=10'} hasBin: true - monaco-editor@0.55.1: - resolution: {integrity: sha512-jz4x+TJNFHwHtwuV9vA9rMujcZRb0CEilTEwG2rRSpe/A7Jdkuj8xPKttCgOh+v/lkHy7HsZ64oj+q3xoAFl9A==} + monaco-editor@0.57.0: + resolution: {integrity: sha512-5BkI9KGoqrNvBGUe15/QlZq3OooZ8WLg1AxTpaqHRCP3HNpzPPZKE2EDz8M7c+VRmCeUw1Brp4cx/PWm3kI/5A==} mri@1.2.0: resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==} @@ -12923,7 +12923,7 @@ snapshots: dependencies: domelementtype: 2.3.0 - dompurify@3.2.7: + dompurify@3.4.15: optionalDependencies: '@types/trusted-types': 2.0.7 @@ -14385,9 +14385,9 @@ snapshots: mkdirp@3.0.1: {} - monaco-editor@0.55.1: + monaco-editor@0.57.0: dependencies: - dompurify: 3.2.7 + dompurify: 3.4.15 marked: 14.0.0 mri@1.2.0: {} From 44f2d0e57631349f6d2a585d2b762e2883be816d Mon Sep 17 00:00:00 2001 From: dormouse-bot <287024035+dormouse-bot@users.noreply.github.com> Date: Tue, 20 Oct 2026 03:16:07 +0000 Subject: [PATCH 2/2] fix: move monaco-editor imports to the 0.56+ entry points monaco-editor 0.56 reorganized its ESM modules behind an exports map, so the deep esm/vs/... imports no longer resolve. Import the editor API from monaco-editor/editor, the features from features/register.all, and each language from languages/definitions//register. Regenerate the npm dependency disclosure for the new monaco-editor and DOMPurify. --- dor-tools-builtin/viewer/editor.ts | 36 +++++++++++++------------- website/src/data/dependencies-npm.json | 4 +-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dor-tools-builtin/viewer/editor.ts b/dor-tools-builtin/viewer/editor.ts index bc537fb0e..4e3bfe11e 100644 --- a/dor-tools-builtin/viewer/editor.ts +++ b/dor-tools-builtin/viewer/editor.ts @@ -1,21 +1,21 @@ -import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js'; -import 'monaco-editor/esm/vs/editor/editor.all.js'; -import 'monaco-editor/esm/vs/basic-languages/typescript/typescript.contribution.js'; -import 'monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution.js'; -import 'monaco-editor/esm/vs/basic-languages/python/python.contribution.js'; -import 'monaco-editor/esm/vs/basic-languages/rust/rust.contribution.js'; -import 'monaco-editor/esm/vs/basic-languages/go/go.contribution.js'; -import 'monaco-editor/esm/vs/basic-languages/java/java.contribution.js'; -import 'monaco-editor/esm/vs/basic-languages/cpp/cpp.contribution.js'; -import 'monaco-editor/esm/vs/basic-languages/shell/shell.contribution.js'; -import 'monaco-editor/esm/vs/basic-languages/powershell/powershell.contribution.js'; -import 'monaco-editor/esm/vs/basic-languages/sql/sql.contribution.js'; -import 'monaco-editor/esm/vs/basic-languages/yaml/yaml.contribution.js'; -import 'monaco-editor/esm/vs/basic-languages/xml/xml.contribution.js'; -import 'monaco-editor/esm/vs/basic-languages/css/css.contribution.js'; -import 'monaco-editor/esm/vs/basic-languages/markdown/markdown.contribution.js'; -import 'monaco-editor/esm/vs/basic-languages/ini/ini.contribution.js'; -import 'monaco-editor/esm/vs/basic-languages/dockerfile/dockerfile.contribution.js'; +import * as monaco from 'monaco-editor/editor'; +import 'monaco-editor/features/register.all'; +import 'monaco-editor/languages/definitions/typescript/register'; +import 'monaco-editor/languages/definitions/javascript/register'; +import 'monaco-editor/languages/definitions/python/register'; +import 'monaco-editor/languages/definitions/rust/register'; +import 'monaco-editor/languages/definitions/go/register'; +import 'monaco-editor/languages/definitions/java/register'; +import 'monaco-editor/languages/definitions/cpp/register'; +import 'monaco-editor/languages/definitions/shell/register'; +import 'monaco-editor/languages/definitions/powershell/register'; +import 'monaco-editor/languages/definitions/sql/register'; +import 'monaco-editor/languages/definitions/yaml/register'; +import 'monaco-editor/languages/definitions/xml/register'; +import 'monaco-editor/languages/definitions/css/register'; +import 'monaco-editor/languages/definitions/markdown/register'; +import 'monaco-editor/languages/definitions/ini/register'; +import 'monaco-editor/languages/definitions/dockerfile/register'; import { documentSession, stateLabel, textSource } from './document-session'; import { pageTheme } from './page-theme'; import { installTooltips } from './tooltip'; diff --git a/website/src/data/dependencies-npm.json b/website/src/data/dependencies-npm.json index 896bca2dd..f64dbad1a 100644 --- a/website/src/data/dependencies-npm.json +++ b/website/src/data/dependencies-npm.json @@ -2702,7 +2702,7 @@ "author": "Dr.-Ing. Mario Heiderich, Cure53 (https://cure53.de/)", "homepage": "https://github.com/cure53/DOMPurify", "versions": [ - "3.2.7", + "3.4.15", "3.4.16" ] }, @@ -3436,7 +3436,7 @@ "author": "Microsoft Corporation", "homepage": "https://github.com/microsoft/monaco-editor", "versions": [ - "0.55.1" + "0.57.0" ] }, {