From c1bfe6fa4d5ce36395795fa5f9707339b061a107 Mon Sep 17 00:00:00 2001
From: Lukas Lieb <lukas.lieb@axonivy.com>
Date: Fri, 3 Jan 2025 10:07:06 +0100
Subject: [PATCH] Update package.json

---
 package-lock.json                             | 46 +++++++++++++++++--
 packages/monaco/package.json                  |  8 ++--
 packages/monaco/src/components/CodeEditor.tsx |  2 +-
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3dd1d2ae..4592a3b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -603,6 +603,36 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@codingame/monaco-vscode-editor-service-override": {
+      "version": "1.83.3",
+      "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-editor-service-override/-/monaco-vscode-editor-service-override-1.83.3.tgz",
+      "integrity": "sha512-9j3ixC2KO+U2U4edm27ki17UetdpiQm/nGRAtdLXzUj6fnj34vr4EOyiVaj6/YtCa+qUuEqBrveosvRbUdxJAQ==",
+      "license": "MIT",
+      "dependencies": {
+        "monaco-editor": "0.44.0",
+        "vscode": "npm:@codingame/monaco-vscode-api@1.83.3"
+      }
+    },
+    "node_modules/@codingame/monaco-vscode-languages-service-override": {
+      "version": "1.83.3",
+      "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-languages-service-override/-/monaco-vscode-languages-service-override-1.83.3.tgz",
+      "integrity": "sha512-ECIZbjFnB1gv+KiEhYVH26InXYUhBy1lZ8L8LJqL2fk8M9uni3bnVoV8yfP0OXd0L+tpjsL3hsNXv304a222+g==",
+      "license": "MIT",
+      "dependencies": {
+        "monaco-editor": "0.44.0",
+        "vscode": "npm:@codingame/monaco-vscode-api@1.83.3"
+      }
+    },
+    "node_modules/@codingame/monaco-vscode-model-service-override": {
+      "version": "1.83.3",
+      "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-model-service-override/-/monaco-vscode-model-service-override-1.83.3.tgz",
+      "integrity": "sha512-Bc0LujY0SBMvVJqB1YOVQzJPfApWyhHU79pCQiCPG2HbhdAOw1RDakbZ1iTA2i95q8ksgQTKVzgWLfL1Kj/McA==",
+      "license": "MIT",
+      "dependencies": {
+        "monaco-editor": "0.44.0",
+        "vscode": "npm:@codingame/monaco-vscode-api@1.83.3"
+      }
+    },
     "node_modules/@emnapi/core": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.3.1.tgz",
@@ -1769,6 +1799,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@monaco-editor/loader/-/loader-1.4.0.tgz",
       "integrity": "sha512-00ioBig0x642hytVspPl7DbQyaSWRaolYie/UFNjoTdvoKPzo6xrXLhTk9ixgIKcLH5b5vDOjVNiGyY+uDCUlg==",
+      "license": "MIT",
       "dependencies": {
         "state-local": "^1.0.6"
       },
@@ -1780,6 +1811,7 @@
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.6.0.tgz",
       "integrity": "sha512-RFkU9/i7cN2bsq/iTkurMWOEErmYcY6JiQI3Jn+WeR/FGISH8JbHERjpS9oRuSOPvDMJI0Z8nJeKkbOs9sBYQw==",
+      "license": "MIT",
       "dependencies": {
         "@monaco-editor/loader": "^1.4.0"
       },
@@ -15483,6 +15515,12 @@
       "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
       "dev": true
     },
+    "node_modules/state-local": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/state-local/-/state-local-1.0.7.tgz",
+      "integrity": "sha512-HTEHMNieakEnoe33shBYcZ7NX83ACUjCu8c40iOGEZsngj9zRnkqS9j1pqQPXwobB0ZcVTk27REb7COQ0UR59w==",
+      "license": "MIT"
+    },
     "node_modules/std-env": {
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.8.0.tgz",
@@ -17976,7 +18014,7 @@
     },
     "packages/monaco": {
       "name": "@axonivy/monaco",
-      "version": "12.0.0-next",
+      "version": "13.1.0-next",
       "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
       "dependencies": {
         "@codingame/monaco-vscode-editor-service-override": "1.83.3",
@@ -17993,9 +18031,9 @@
         "react-dom": "^18.3.1"
       },
       "peerDependencies": {
-        "@axonivy/jsonrpc": "^12.0.0-next",
-        "@axonivy/ui-components": "^12.0.0-next",
-        "react": "^18.2.0"
+        "@axonivy/jsonrpc": "~13.1.0-next",
+        "@axonivy/ui-components": "~13.1.0-next",
+        "react": "^18.2 || ^19.0"
       }
     }
   }
diff --git a/packages/monaco/package.json b/packages/monaco/package.json
index 57c1777f..cebcea20 100644
--- a/packages/monaco/package.json
+++ b/packages/monaco/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@axonivy/monaco",
-  "version": "0.0.1-dev",
+  "version": "13.1.0-next",
   "private": false,
   "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
   "author": "Axon Ivy AG",
@@ -25,9 +25,9 @@
     "vscode-languageserver-protocol": "3.17.5"
   },
   "peerDependencies": {
-    "@axonivy/jsonrpc": "^12.0.0-next",
-    "@axonivy/ui-components": "^12.0.0-next",
-    "react": "^18.2.0"
+    "@axonivy/jsonrpc": "~13.1.0-next",
+    "@axonivy/ui-components": "~13.1.0-next",
+    "react": "^18.2 || ^19.0"
   },
   "devDependencies": {
     "react-dom": "^18.3.1"
diff --git a/packages/monaco/src/components/CodeEditor.tsx b/packages/monaco/src/components/CodeEditor.tsx
index 2ee53dc3..9dd2866b 100644
--- a/packages/monaco/src/components/CodeEditor.tsx
+++ b/packages/monaco/src/components/CodeEditor.tsx
@@ -29,7 +29,7 @@ export const CodeEditor = ({ contextPath, value, onChange, language, onMountFunc
     setShowPlaceholder(editor.getValue() === '');
   };
 
-  const monacoOptions = options ?? MONACO_OPTIONS;
+  const monacoOptions = { ...(options ?? MONACO_OPTIONS) };
   monacoOptions.readOnly = readonly;
 
   return (