Merge pull request #9965 from overleaf/ae-rollback-cm6-upgrade

Revert "Upgrade CodeMirror dependencies (#9933)"

GitOrigin-RevId: f46e13750d29f11a53719dcf244aa93cd115e45e

package-lock.json

@@ -2653,9 +2653,9 @@
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.1.1.tgz",
-      "integrity": "sha512-ibDohwkk7vyu3VsnZNlQhwk0OETBtlkYV+6AHfn5Zgq0sxa+yGVX+apwtC3M4wh6AH7yU5si/NysoECs5EGS3Q==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.1.0.tgz",
+      "integrity": "sha512-qCj2YqmbBjj0P1iumnlL5lBqZvJPzT+t2UvgjcaXErp5ZvMqFRVgQyrEfdXX6SX5UcvcHKBjXqno+MkUp0aYvQ==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -2703,9 +2703,9 @@
       }
     },
     "node_modules/@codemirror/lang-markdown": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.0.2.tgz",
-      "integrity": "sha512-wsUGGP8ihCVJKzVciOpsZXteSY1IRTe/C4eYb2QUEDl41ZiRfmdhA4llechqDaRdGOJuc45oCjBVjOo94CBHtA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.0.1.tgz",
+      "integrity": "sha512-pHPQuRwf9cUrmkmsTHRjtS9ZnGu3fA9YzAdh2++d+L9wbfnC2XbKh0Xvm/0YiUjdCnoCx9wDFEoCuAnkqKWLIw==",
       "dependencies": {
         "@codemirror/lang-html": "^6.0.0",
         "@codemirror/language": "^6.0.0",
@@ -2754,9 +2754,9 @@
       "integrity": "sha512-Mxff85Hp5va+zuj+H748KbubXjrinX/k28lj43H14T2D0+4kuvEFIEIO7hCEcvBT8ubZyIelt9yGOjj2MWOEQA=="
     },
     "node_modules/@codemirror/view": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.3.1.tgz",
-      "integrity": "sha512-NKPBphoV9W2Q6tKXk+ge4q5EhMOOC0rpwdGS80/slNSfsVqkN4gwXIEqSprXJFlf9aUKZU7WhPvqRBMNH+hJkQ==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.3.0.tgz",
+      "integrity": "sha512-jMN9OGKmzRPJ+kksfMrB5e/A9heQncirHsz8XNBpgEbYONCk5tWHMKVWKTNwznkUGD5mnigXI1i5YIcWpscSPg==",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "style-mod": "^4.0.0",
@@ -3970,9 +3970,9 @@
       }
     },
     "node_modules/@lezer/highlight": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.1.tgz",
-      "integrity": "sha512-duv9D23O9ghEDnnUDmxu+L8pJy4nYo4AbCOHIudUhscrLSazqeJeK1V50EU6ZufWF1zv0KJwu/frFRyZWXxHBQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.0.tgz",
+      "integrity": "sha512-DAGFnxWil6aMrfpJ1clvOQrMvgDXjah8K5eA6+TsETioHlSi7Z2n/KSpbJPeuItcI2OeOR5tIWsqZqLnFSGN/w==",
       "dependencies": {
         "@lezer/common": "^1.0.0"
       }
@@ -34929,15 +34929,15 @@
         "@babel/preset-react": "^7.14.5",
         "@babel/preset-typescript": "^7.16.0",
         "@codemirror/autocomplete": "^6.3.0",
-        "@codemirror/commands": "^6.1.1",
-        "@codemirror/lang-markdown": "^6.0.2",
+        "@codemirror/commands": "^6.1.0",
+        "@codemirror/lang-markdown": "^6.0.1",
         "@codemirror/language": "^6.2.1",
         "@codemirror/lint": "^6.0.0",
         "@codemirror/search": "^6.2.1",
         "@codemirror/state": "^6.1.2",
-        "@codemirror/view": "^6.3.1",
+        "@codemirror/view": "^6.3.0",
         "@lezer/common": "^1.0.1",
-        "@lezer/highlight": "^1.1.1",
+        "@lezer/highlight": "^1.1.0",
         "@lezer/lr": "^1.2.3",
         "@overleaf/logger": "^3.1.0",
         "@overleaf/metrics": "^4.0.0",
@@ -38389,9 +38389,9 @@
       }
     },
     "@codemirror/commands": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.1.1.tgz",
-      "integrity": "sha512-ibDohwkk7vyu3VsnZNlQhwk0OETBtlkYV+6AHfn5Zgq0sxa+yGVX+apwtC3M4wh6AH7yU5si/NysoECs5EGS3Q==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.1.0.tgz",
+      "integrity": "sha512-qCj2YqmbBjj0P1iumnlL5lBqZvJPzT+t2UvgjcaXErp5ZvMqFRVgQyrEfdXX6SX5UcvcHKBjXqno+MkUp0aYvQ==",
       "requires": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -38439,9 +38439,9 @@
       }
     },
     "@codemirror/lang-markdown": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.0.2.tgz",
-      "integrity": "sha512-wsUGGP8ihCVJKzVciOpsZXteSY1IRTe/C4eYb2QUEDl41ZiRfmdhA4llechqDaRdGOJuc45oCjBVjOo94CBHtA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.0.1.tgz",
+      "integrity": "sha512-pHPQuRwf9cUrmkmsTHRjtS9ZnGu3fA9YzAdh2++d+L9wbfnC2XbKh0Xvm/0YiUjdCnoCx9wDFEoCuAnkqKWLIw==",
       "requires": {
         "@codemirror/lang-html": "^6.0.0",
         "@codemirror/language": "^6.0.0",
@@ -38490,9 +38490,9 @@
       "integrity": "sha512-Mxff85Hp5va+zuj+H748KbubXjrinX/k28lj43H14T2D0+4kuvEFIEIO7hCEcvBT8ubZyIelt9yGOjj2MWOEQA=="
     },
     "@codemirror/view": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.3.1.tgz",
-      "integrity": "sha512-NKPBphoV9W2Q6tKXk+ge4q5EhMOOC0rpwdGS80/slNSfsVqkN4gwXIEqSprXJFlf9aUKZU7WhPvqRBMNH+hJkQ==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.3.0.tgz",
+      "integrity": "sha512-jMN9OGKmzRPJ+kksfMrB5e/A9heQncirHsz8XNBpgEbYONCk5tWHMKVWKTNwznkUGD5mnigXI1i5YIcWpscSPg==",
       "requires": {
         "@codemirror/state": "^6.0.0",
         "style-mod": "^4.0.0",
@@ -39498,9 +39498,9 @@
       }
     },
     "@lezer/highlight": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.1.tgz",
-      "integrity": "sha512-duv9D23O9ghEDnnUDmxu+L8pJy4nYo4AbCOHIudUhscrLSazqeJeK1V50EU6ZufWF1zv0KJwu/frFRyZWXxHBQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.0.tgz",
+      "integrity": "sha512-DAGFnxWil6aMrfpJ1clvOQrMvgDXjah8K5eA6+TsETioHlSi7Z2n/KSpbJPeuItcI2OeOR5tIWsqZqLnFSGN/w==",
       "requires": {
         "@lezer/common": "^1.0.0"
       }
@@ -42647,18 +42647,18 @@
         "@babel/preset-typescript": "^7.16.0",
         "@babel/register": "^7.14.5",
         "@codemirror/autocomplete": "^6.3.0",
-        "@codemirror/commands": "^6.1.1",
-        "@codemirror/lang-markdown": "^6.0.2",
+        "@codemirror/commands": "^6.1.0",
+        "@codemirror/lang-markdown": "^6.0.1",
         "@codemirror/language": "^6.2.1",
         "@codemirror/lint": "^6.0.0",
         "@codemirror/search": "^6.2.1",
         "@codemirror/state": "^6.1.2",
-        "@codemirror/view": "^6.3.1",
+        "@codemirror/view": "^6.3.0",
         "@cypress/react": "^6.2.0",
         "@juggle/resize-observer": "^3.3.1",
         "@lezer/common": "^1.0.1",
         "@lezer/generator": "^1.1.1",
-        "@lezer/highlight": "^1.1.1",
+        "@lezer/highlight": "^1.1.0",
         "@lezer/lr": "^1.2.3",
         "@overleaf/logger": "^3.1.0",
         "@overleaf/metrics": "^4.0.0",
@@ -42845,7 +42845,7 @@
         "react-dnd-html5-backend": "^11.1.3",
         "react-dom": "^17.0.2",
         "react-error-boundary": "^2.3.1",
-        "react-i18next": "^11.18.6",
+        "react-i18next": "11.18.6",
         "react-linkify": "^1.0.0-alpha",
         "react-refresh": "^0.14.0",
         "react2angular": "^4.0.6",

services/web/package.json

@@ -69,15 +69,15 @@
     "@babel/preset-react": "^7.14.5",
     "@babel/preset-typescript": "^7.16.0",
     "@codemirror/autocomplete": "^6.3.0",
-    "@codemirror/commands": "^6.1.1",
-    "@codemirror/lang-markdown": "^6.0.2",
+    "@codemirror/commands": "^6.1.0",
+    "@codemirror/lang-markdown": "^6.0.1",
     "@codemirror/language": "^6.2.1",
     "@codemirror/lint": "^6.0.0",
     "@codemirror/search": "^6.2.1",
     "@codemirror/state": "^6.1.2",
-    "@codemirror/view": "^6.3.1",
+    "@codemirror/view": "^6.3.0",
     "@lezer/common": "^1.0.1",
-    "@lezer/highlight": "^1.1.1",
+    "@lezer/highlight": "^1.1.0",
     "@lezer/lr": "^1.2.3",
     "@overleaf/logger": "^3.1.0",
     "@overleaf/metrics": "^4.0.0",