Merge 5e01f2123b into c5047d8df8

frontend/package.json

@@ -15,7 +15,7 @@
   ],
   "devDependencies": {
     "@babel/core": "^7.14.5",
-    "@babel/preset-env": "^7.14.5",
+    "@babel/preset-env": "^7.22.15",
     "@babel/preset-react": "^7.14.5",
     "@types/react": "^17.0.11",
     "@types/react-dom": "^17.0.7",
@@ -26,7 +26,7 @@
     "core-js": "^3.14.0",
     "css-loader": "^5.2.6",
     "dotenv": "^10.0.0",
-    "ejs": "^3.1.6",
+    "ejs": "^3.1.9",
     "ejs-compiled-loader": "^3.1.0",
     "mediacms-scripts": "file:packages/scripts",
     "postcss-loader": "^6.1.0",
@@ -37,10 +37,10 @@
     "ts-loader": "^9.2.3",
     "typescript": "^4.3.2",
     "url-loader": "^4.1.1",
-    "webpack": "^5.38.1"
+    "webpack": "^5.88.2"
   },
   "dependencies": {
-    "axios": "^0.21.1",
+    "axios": "^0.21.4",
     "flux": "^4.0.1",
     "mediacms-player": "file:packages/player",
     "normalize.css": "^8.0.1",
@@ -49,6 +49,6 @@
     "react-mentions": "^4.3.1",
     "sortablejs": "^1.13.0",
     "timeago.js": "^4.0.2",
-    "url-parse": "^1.5.1"
+    "url-parse": "^1.5.10"
   }
 }

frontend/src/static/js/components/comments/Comments.jsx

@@ -8,9 +8,10 @@ import { PageActions, MediaPageActions } from '../../utils/actions/';
 import { LinksContext, MemberContext, SiteContext } from '../../utils/contexts/';
 import { PopupMain, UserThumbnail } from '../_shared';
 
-import './videojs-markers.js';
-import './videojs.markers.css';
-import {enableMarkers, addMarker} from './videojs-markers_config.js'
+// TODO: Marker functionality is already disabled (see comment below), and even including these breaks video viewing.  Until then, disable the imports.
+// import './videojs-markers.js';
+// import './videojs.markers.css';
+// import {enableMarkers, addMarker} from './videojs-markers_config.js'
 
 import './Comments.scss';