From 662f039daa9437317cd128271d2962ecfbd32fb0 Mon Sep 17 00:00:00 2001
From: David Bolack <dbolack@gmail.com>
Date: Sun, 12 Jan 2025 14:13:27 -0600
Subject: [PATCH] Merge conflict clearing

---
 package-lock.json | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 072108b1f..d05e97f62 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "classnames": "^2.5.1",
         "codemirror": "^5.65.6",
         "cookie-parser": "^1.4.7",
-        "core-js": "^3.39.0",
+        "core-js": "^3.40.0",
         "cors": "^2.8.5",
         "create-react-class": "^15.7.0",
         "dedent-tabs": "^0.10.3",
@@ -36,17 +36,17 @@
         "lodash": "^4.17.21",
         "marked": "11.2.0",
         "marked-emoji": "^1.4.3",
-        "marked-extended-tables": "^1.0.10",
+        "marked-extended-tables": "^1.1.0",
         "marked-gfm-heading-id": "^3.2.0",
         "marked-smartypants-lite": "^1.0.2",
         "markedLegacy": "npm:marked@^0.3.19",
         "moment": "^2.30.1",
-        "mongoose": "^8.9.2",
+        "mongoose": "^8.9.4",
         "nanoid": "5.0.9",
         "nconf": "^0.12.1",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
-        "react-frame-component": "^4.1.3",
+        "react-frame-component": "^5.2.7",
         "react-router": "^7.1.1",
         "sanitize-filename": "1.6.3",
         "superagent": "^10.1.1",
@@ -54,7 +54,7 @@
       },
       "devDependencies": {
         "@stylistic/stylelint-plugin": "^3.1.1",
-        "babel-plugin-transform-import-meta": "^2.2.1",
+        "babel-plugin-transform-import-meta": "^2.3.2",
         "eslint": "^9.17.0",
         "eslint-plugin-jest": "^28.10.0",
         "eslint-plugin-react": "^7.37.3",
@@ -3678,14 +3678,14 @@
       }
     },
     "node_modules/babel-plugin-transform-import-meta": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-import-meta/-/babel-plugin-transform-import-meta-2.2.1.tgz",
-      "integrity": "sha512-AxNh27Pcg8Kt112RGa3Vod2QS2YXKKJ6+nSvRtv7qQTJAdx0MZa4UHZ4lnxHUWA2MNbLuZQv5FVab4P1CoLOWw==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-import-meta/-/babel-plugin-transform-import-meta-2.3.2.tgz",
+      "integrity": "sha512-902o4GiQqI1GqAXfD5rEoz0PJamUfJ3VllpdWaNsFTwdaNjFSFHawvBO+cp5K2j+g2h3bZ4lnM1Xb6yFYGihtA==",
       "dev": true,
       "license": "BSD",
       "dependencies": {
-        "@babel/template": "^7.4.4",
-        "tslib": "^2.4.0"
+        "@babel/template": "^7.25.9",
+        "tslib": "^2.8.1"
       },
       "peerDependencies": {
         "@babel/core": "^7.10.0"
@@ -4645,9 +4645,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.39.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.39.0.tgz",
-      "integrity": "sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==",
+      "version": "3.40.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.40.0.tgz",
+      "integrity": "sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==",
       "hasInstallScript": true,
       "license": "MIT",
       "funding": {
@@ -9868,12 +9868,12 @@
       }
     },
     "node_modules/marked-extended-tables": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/marked-extended-tables/-/marked-extended-tables-1.0.10.tgz",
-      "integrity": "sha512-zvRS0GPTkxq8UWawSDecd1Rxd2KD8crrmq2QALGDdrgkcgRNQzHlbnlujBGuXxdgDJg7f6UTv+JpcfejBpKdSg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/marked-extended-tables/-/marked-extended-tables-1.1.0.tgz",
+      "integrity": "sha512-xPQlnmr/mpIJEjwg9/guSKzxoKu7hyCD/sM59mcZc+nMIh2JuVM2se+kCa1Jo1UH+BEHcNlZ221ziJ/cOxAgCA==",
       "license": "MIT",
       "peerDependencies": {
-        "marked": ">=3 <15"
+        "marked": ">=3 <16"
       }
     },
     "node_modules/marked-gfm-heading-id": {
@@ -10254,9 +10254,9 @@
       }
     },
     "node_modules/mongoose": {
-      "version": "8.9.2",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.9.2.tgz",
-      "integrity": "sha512-mLWynmZS1v8HTeMxyLhskQncS1SkrjW1eLNuFDYGQMQ/5QrFrxTLNwWXeCRZeKT2lXyaxW8bnJC9AKPT9jYMkw==",
+      "version": "8.9.4",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.9.4.tgz",
+      "integrity": "sha512-DndoI01aV/q40P9DiYDXsYjhj8vZjmmuFwcC3Tro5wFznoE1z6Fe2JgMnbLR6ghglym5ziYizSfAJykp+UPZWg==",
       "license": "MIT",
       "dependencies": {
         "bson": "^6.10.1",
@@ -11675,9 +11675,9 @@
       }
     },
     "node_modules/react-frame-component": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/react-frame-component/-/react-frame-component-4.1.3.tgz",
-      "integrity": "sha512-4PurhctiqnmC1F5prPZ+LdsalH7pZ3SFA5xoc0HBe8mSHctdLLt4Cr2WXfXOoajHBYq/yiipp9zOgx+vy8GiEA==",
+      "version": "5.2.7",
+      "resolved": "https://registry.npmjs.org/react-frame-component/-/react-frame-component-5.2.7.tgz",
+      "integrity": "sha512-ROjHtSLoSVYUBfTieazj/nL8jIX9rZFmHC0yXEU+dx6Y82OcBEGgU9o7VyHMrBFUN9FuQ849MtIPNNLsb4krbg==",
       "license": "MIT",
       "peerDependencies": {
         "prop-types": "^15.5.9",