Merge pull request #10393 from overleaf/mj-cm6-indentation-markers

[cm6] Add indentation markers

GitOrigin-RevId: 29538d549e5d347841621d75b74052552f19630b

package-lock.json

@@ -7563,6 +7563,17 @@
         "@codemirror/view": "^6.3.0"
       }
     },
+    "node_modules/@replit/codemirror-indentation-markers": {
+      "version": "6.1.0",
+      "resolved": "git+ssh://git@github.com/overleaf/codemirror-indentation-markers.git#fcbd6c381cc53a7a489cf53ef58e706ffe1ea70d",
+      "integrity": "sha512-vlzCiXrOCVoYqaLWh2yUbMZWXmWhucsOIovc4pf09AyapO+/egJ6BcugwXiOmhzRL4JLH0WmAQsuAo4P11OXUQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0"
+      }
+    },
     "node_modules/@replit/codemirror-vim": {
       "version": "6.0.4",
       "resolved": "git+ssh://git@github.com/overleaf/codemirror-vim.git#77876ac3390f5a6642e04348c0afbe9f0878ec25",
@@ -34413,6 +34424,7 @@
         "@pollyjs/persister-fs": "^4.2.1",
         "@reach/tabs": "^0.15.0",
         "@replit/codemirror-emacs": "overleaf/codemirror-emacs#3f235870d4fa83069df855d6588569865c31e220",
+        "@replit/codemirror-indentation-markers": "overleaf/codemirror-indentation-markers#fcbd6c381cc53a7a489cf53ef58e706ffe1ea70d",
         "@replit/codemirror-vim": "overleaf/codemirror-vim#77876ac3390f5a6642e04348c0afbe9f0878ec25",
         "@sentry/browser": "^7.8.1",
         "@uppy/core": "^1.15.0",
@@ -43544,6 +43556,7 @@
         "@pollyjs/persister-fs": "^4.2.1",
         "@reach/tabs": "^0.15.0",
         "@replit/codemirror-emacs": "overleaf/codemirror-emacs#3f235870d4fa83069df855d6588569865c31e220",
+        "@replit/codemirror-indentation-markers": "overleaf/codemirror-indentation-markers#fcbd6c381cc53a7a489cf53ef58e706ffe1ea70d",
         "@replit/codemirror-vim": "overleaf/codemirror-vim#77876ac3390f5a6642e04348c0afbe9f0878ec25",
         "@sentry/browser": "^7.8.1",
         "@testing-library/cypress": "^9.0.0",
@@ -43559,7 +43572,7 @@
         "@types/react": "^17.0.40",
         "@types/react-bootstrap": "^0.32.29",
         "@types/react-dom": "^17.0.13",
-        "@types/recurly__recurly-js": "*",
+        "@types/recurly__recurly-js": "^4.22.0",
         "@types/sinon-chai": "^3.2.8",
         "@types/uuid": "^8.3.4",
         "@typescript-eslint/eslint-plugin": "^5.12.1",
@@ -45663,6 +45676,12 @@
       "from": "@replit/codemirror-emacs@overleaf/codemirror-emacs#3f235870d4fa83069df855d6588569865c31e220",
       "requires": {}
     },
+    "@replit/codemirror-indentation-markers": {
+      "version": "git+ssh://git@github.com/overleaf/codemirror-indentation-markers.git#fcbd6c381cc53a7a489cf53ef58e706ffe1ea70d",
+      "integrity": "sha512-vlzCiXrOCVoYqaLWh2yUbMZWXmWhucsOIovc4pf09AyapO+/egJ6BcugwXiOmhzRL4JLH0WmAQsuAo4P11OXUQ==",
+      "from": "@replit/codemirror-indentation-markers@overleaf/codemirror-indentation-markers#fcbd6c381cc53a7a489cf53ef58e706ffe1ea70d",
+      "requires": {}
+    },
     "@replit/codemirror-vim": {
       "version": "git+ssh://git@github.com/overleaf/codemirror-vim.git#77876ac3390f5a6642e04348c0afbe9f0878ec25",
       "integrity": "sha512-RgUkjOul+ReaCOj6SxCtIviKjJGDn7h15bODIClN/oFwaOwhTjelTlIReY1t5tlYEwkp5SFBL04PaSZLJp1sSQ==",

services/web/package.json

@@ -112,6 +112,7 @@
     "@reach/tabs": "^0.15.0",
     "@replit/codemirror-emacs": "overleaf/codemirror-emacs#3f235870d4fa83069df855d6588569865c31e220",
     "@replit/codemirror-vim": "overleaf/codemirror-vim#77876ac3390f5a6642e04348c0afbe9f0878ec25",
+    "@replit/codemirror-indentation-markers": "overleaf/codemirror-indentation-markers#fcbd6c381cc53a7a489cf53ef58e706ffe1ea70d",
     "@sentry/browser": "^7.8.1",
     "@uppy/core": "^1.15.0",
     "@uppy/dashboard": "^1.11.0",