Use codemirror merge addon to replace mis-merge

Author: yaoweiprc

package-lock.json

@@ -54,15 +54,14 @@
     "@getinsomnia/srp-js": "1.0.0-alpha.1",
     "@grpc/grpc-js": "^1.13.3",
     "@grpc/proto-loader": "^0.7.13",
-    "@mismerge/core": "^1.2.1",
     "@react-router/fs-routes": "^7.9.4",
     "@react-router/node": "^7.9.4",
     "@react-router/serve": "^7.9.4",
-    "@seald-io/nedb": "^4.1.1",
-    "@segment/analytics-node": "2.2.1",
     "@rjsf/core": "^6.0.0-beta.15",
     "@rjsf/utils": "^6.0.0-beta.15",
     "@rjsf/validator-ajv8": "^6.0.0-beta.15",
+    "@seald-io/nedb": "^4.1.1",
+    "@segment/analytics-node": "2.2.1",
     "@sentry/electron": "^6.5.0",
     "@stoplight/spectral-core": "^1.20.0",
     "@stoplight/spectral-formats": "^1.8.2",
@@ -88,6 +87,7 @@
     "date-fns": "^3.6.0",
     "decompress": "^4.2.1",
     "deep-equal": "^1.1.2",
+    "diff-match-patch-ts": "^0.6.0",
     "dompurify": "^3.2.5",
     "electron-context-menu": "^3.6.1",
     "electron-updater": "^6.6.2",
@@ -149,8 +149,8 @@
   },
   "devDependencies": {
     "@develohpanda/fluent-builder": "^2.1.2",
-    "@react-router/dev": "^7.9.4",
     "@modelcontextprotocol/sdk": "^1.17.5",
+    "@react-router/dev": "^7.9.4",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",

packages/insomnia/package.json

@@ -33,6 +33,7 @@ import 'codemirror/addon/selection/active-line';
 import 'codemirror/addon/selection/selection-pointer';
 import 'codemirror/addon/display/placeholder';
 import 'codemirror/addon/lint/lint';
+import 'codemirror/addon/merge/merge.js';
 
 // for the code that uses this yaml parser, see https://github.com/codemirror/CodeMirror/blob/master/addon/lint/yaml-lint.js
 import * as jsyaml from 'js-yaml';