diff --git a/msa/js-executor/yarn.lock b/msa/js-executor/yarn.lock index 5e3330e0d7..439ab60d05 100644 --- a/msa/js-executor/yarn.lock +++ b/msa/js-executor/yarn.lock @@ -447,9 +447,9 @@ body-parser@^2.2.0: type-is "^2.0.0" brace-expansion@^1.1.7: - version "1.1.13" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.13.tgz#d37875c01dc9eff988dd49d112a57cb67b54efe6" - integrity sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w== + version "1.1.18" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.18.tgz#3ce74d89885136be1535341f8c3d4425c29a5cab" + integrity sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw== dependencies: balanced-match "^1.0.0" concat-map "0.0.1" @@ -1030,9 +1030,9 @@ isarray@~1.0.0: integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== js-yaml@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b" - integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA== + version "4.3.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.3.1.tgz#01216c001d67f48e2cd560d708c7af21090a3848" + integrity sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ== dependencies: argparse "^2.0.1" @@ -1654,9 +1654,9 @@ tar-stream@^2.1.4: readable-stream "^3.1.1" tar@>=7.5.8, tar@^7.4.3: - version "7.5.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.11.tgz#1250fae45d98806b36d703b30973fa8e0a6d8868" - integrity sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ== + version "7.5.22" + resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.22.tgz#a696f998136e71487dc3f869a85bba2c67971ba9" + integrity sha512-MFO/QzvtAOmJbkhOaCTvbGcFN9L9b+JunIsDwaKljSOdcLMea3NJ1k9Usz/rjdfSXTq4dfzfeS7W4p4YOAAHeA== dependencies: "@isaacs/fs-minipass" "^4.0.0" chownr "^3.0.0" diff --git a/msa/web-ui/yarn.lock b/msa/web-ui/yarn.lock index 033aeac686..d876d9df50 100644 --- a/msa/web-ui/yarn.lock +++ b/msa/web-ui/yarn.lock @@ -379,9 +379,9 @@ body-parser@^2.2.0: type-is "^2.0.0" brace-expansion@^1.1.7: - version "1.1.13" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.13.tgz#d37875c01dc9eff988dd49d112a57cb67b54efe6" - integrity sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w== + version "1.1.18" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.18.tgz#3ce74d89885136be1535341f8c3d4425c29a5cab" + integrity sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw== dependencies: balanced-match "^1.0.0" concat-map "0.0.1" @@ -1018,9 +1018,9 @@ isarray@~1.0.0: integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== js-yaml@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b" - integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA== + version "4.3.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.3.1.tgz#01216c001d67f48e2cd560d708c7af21090a3848" + integrity sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ== dependencies: argparse "^2.0.1" @@ -1631,9 +1631,9 @@ tar-stream@^2.1.4: readable-stream "^3.1.1" tar@>=7.5.8, tar@^7.4.3: - version "7.5.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.11.tgz#1250fae45d98806b36d703b30973fa8e0a6d8868" - integrity sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ== + version "7.5.22" + resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.22.tgz#a696f998136e71487dc3f869a85bba2c67971ba9" + integrity sha512-MFO/QzvtAOmJbkhOaCTvbGcFN9L9b+JunIsDwaKljSOdcLMea3NJ1k9Usz/rjdfSXTq4dfzfeS7W4p4YOAAHeA== dependencies: "@isaacs/fs-minipass" "^4.0.0" chownr "^3.0.0" diff --git a/ui-ngx/angular.json b/ui-ngx/angular.json index 007af200ba..08ffdd7b9a 100644 --- a/ui-ngx/angular.json +++ b/ui-ngx/angular.json @@ -74,8 +74,8 @@ }, { "glob": "**/*", - "input": "node_modules/tinymce", - "output": "/assets/tinymce/" + "input": "node_modules/hugerte", + "output": "/assets/hugerte/" }, { "glob": "marker-icon-2x.png", diff --git a/ui-ngx/package.json b/ui-ngx/package.json index 8b5db9d15a..8a14e254f9 100644 --- a/ui-ngx/package.json +++ b/ui-ngx/package.json @@ -9,24 +9,25 @@ "build:types": "node generate-types.js", "build:icon-metadata": "node generate-icon-metadata.js", "lint": "ng lint", - "prepare": "patch-package" + "prepare": "patch-package --error-on-fail" }, "private": true, "dependencies": { - "@angular/animations": "20.3.25", + "@angular/animations": "20.3.28", "@angular/cdk": "20.2.14", - "@angular/common": "20.3.25", - "@angular/compiler": "20.3.25", - "@angular/core": "20.3.25", - "@angular/forms": "20.3.25", + "@angular/common": "20.3.28", + "@angular/compiler": "20.3.28", + "@angular/core": "20.3.28", + "@angular/forms": "20.3.28", "@angular/material": "20.2.14", - "@angular/platform-browser": "20.3.25", - "@angular/platform-browser-dynamic": "20.3.25", - "@angular/router": "20.3.25", + "@angular/platform-browser": "20.3.28", + "@angular/platform-browser-dynamic": "20.3.28", + "@angular/router": "20.3.28", "@auth0/angular-jwt": "^5.2.0", "@flowjs/flow.js": "^2.14.1", "@flowjs/ngx-flow": "20.0.2", "@geoman-io/leaflet-geoman-free": "2.19.3", + "@hugerte/hugerte-angular": "~1.1.1", "@iplab/ngx-color-picker": "^20.0.0", "@mat-datetimepicker/core": "~16.0.1", "@mdi/svg": "^7.4.47", @@ -38,7 +39,6 @@ "@svgdotjs/svg.filter.js": "^3.0.9", "@svgdotjs/svg.js": "3.2.4", "@svgdotjs/svg.panzoom.js": "^2.1.2", - "@tinymce/tinymce-angular": "^8.0.1", "ace-builds": "1.43.6", "ace-diff": "^3.3.0", "angular-gridster2": "~20.2.4", @@ -51,6 +51,7 @@ "flot.curvedlines": "https://github.com/MichaelZinsmaier/CurvedLines.git#master", "font-awesome": "^4.7.0", "html2canvas": "^1.4.1", + "hugerte": "~1.0.12", "jquery": "^3.7.1", "jquery.terminal": "^2.45.2", "js-beautify": "1.15.4", @@ -87,7 +88,6 @@ "split.js": "^1.6.5", "systemjs": "6.15.1", "tinycolor2": "^1.6.0", - "tinymce": "~6.8.6", "tooltipster": "^4.2.8", "tslib": "^2.8.1", "typeface-roboto": "^1.1.13", @@ -95,13 +95,13 @@ }, "devDependencies": { "@angular-builders/custom-esbuild": "20.0.0", - "@angular-devkit/build-angular": "20.3.25", - "@angular-devkit/core": "20.3.25", - "@angular-devkit/schematics": "20.3.25", - "@angular/build": "20.3.25", - "@angular/cli": "20.3.25", - "@angular/compiler-cli": "20.3.25", - "@angular/language-service": "20.3.25", + "@angular-devkit/build-angular": "20.3.34", + "@angular-devkit/core": "20.3.34", + "@angular-devkit/schematics": "20.3.34", + "@angular/build": "20.3.34", + "@angular/cli": "20.3.34", + "@angular/compiler-cli": "20.3.28", + "@angular/language-service": "20.3.28", "@types/ace-diff": "^2.1.4", "@types/canvas-gauges": "^2.1.8", "@types/flot": "^0.0.36", @@ -137,13 +137,10 @@ "typescript-eslint": "^8.54.0" }, "resolutions": { - "ace-builds": "1.43.6", - "tinymce": "6.8.6", - "@babel/core": "7.28.3", + "@babel/core": "7.29.7", "esbuild": "0.28.1", - "vite": "7.3.5", "rollup": "4.59.0", - "jquery.terminal/**/form-data": ">=4.0.4", + "less": ">=4.9.0", "js-beautify/**/minimatch": "^9.0.7" } } diff --git a/ui-ngx/patches/@angular+build+20.3.25.patch b/ui-ngx/patches/@angular+build+20.3.34.patch similarity index 100% rename from ui-ngx/patches/@angular+build+20.3.25.patch rename to ui-ngx/patches/@angular+build+20.3.34.patch diff --git a/ui-ngx/patches/@angular+core+20.3.25.patch b/ui-ngx/patches/@angular+core+20.3.28.patch similarity index 92% rename from ui-ngx/patches/@angular+core+20.3.25.patch rename to ui-ngx/patches/@angular+core+20.3.28.patch index 5cb9b5e521..cb947112bf 100644 --- a/ui-ngx/patches/@angular+core+20.3.25.patch +++ b/ui-ngx/patches/@angular+core+20.3.28.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/@angular/core/fesm2022/debug_node.mjs b/node_modules/@angular/core/fesm2022/debug_node.mjs -index be43067..079f100 100755 +index be00d4e..8d7ed1a 100755 --- a/node_modules/@angular/core/fesm2022/debug_node.mjs +++ b/node_modules/@angular/core/fesm2022/debug_node.mjs -@@ -9599,13 +9599,13 @@ function findDirectiveDefMatches(tView, tNode) { +@@ -9488,13 +9488,13 @@ function findDirectiveDefMatches(tView, tNode) { if (isNodeMatchingSelectorList(tNode, def.selectors, /* isProjectionMode */ false)) { matches ??= []; if (isComponentDef(def)) { diff --git a/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.html b/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.html index f7ab3fe2b3..ea55c06a66 100644 --- a/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.html +++ b/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.html @@ -17,7 +17,7 @@ -->
{{ title | translate }}
- +