Merge branch 'develop' of github.com:devtron-labs/devtron-fe-common-lib into feature/application-template

Author: eshankvaish

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.9.1-beta-4",
+    "version": "1.9.5-beta-1",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
@@ -102,6 +102,7 @@
         "@codemirror/language": "6.10.8",
         "@codemirror/legacy-modes": "6.4.2",
         "@codemirror/lint": "6.8.4",
+        "@codemirror/merge": "^6.10.0",
         "@codemirror/search": "6.5.8",
         "@lezer/highlight": "1.2.1",
         "@replit/codemirror-indentation-markers": "6.5.3",
@@ -120,7 +121,6 @@
         "marked": "^13.0.3",
         "nanoid": "^3.3.8",
         "react-canvas-confetti": "^2.0.7",
-        "react-codemirror-merge": "4.23.6",
         "react-dates": "^21.8.0",
         "react-diff-viewer-continued": "^3.4.0",
         "react-draggable": "^4.4.5",