Merge pull request #471 from bento-platform/releases/v6.1.1

Port fixes from 6.1.1 to master
bento-platform · Dec 6, 2024 · 8a8f10c · 8a8f10c
2 parents e1304d9 + 2c48c65
commit 8a8f10c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bento_web",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "description": "Bento platform front-end",
   "main": "src/index.tsx",
   "dependencies": {

diff --git a/src/index.tsx b/src/index.tsx
@@ -12,16 +12,13 @@ import { AUTH_CALLBACK_URL, BENTO_URL_NO_TRAILING_SLASH, CLIENT_ID, OPENID_CONFI
 import App from "./components/App";
 import { store } from "./store";
 
-// Suppress warnings about upcoming changes from React Router by opting into this feature
-// TODO: router v7: remove
-const ROUTER_FUTURE = { v7_relativeSplatPath: true, v7_startTransition: true };
-
+// TODO: migrate router to v7
 document.addEventListener("DOMContentLoaded", () => {
   const container = document.getElementById("root")!;
   const root = createRoot(container);
   root.render(
     <Provider store={store}>
-      <BrowserRouter future={ROUTER_FUTURE}>
+      <BrowserRouter>
         <BentoAuthContextProvider
           value={{
             applicationUrl: BENTO_URL_NO_TRAILING_SLASH,

diff --git a/src/propTypes.js b/src/propTypes.js
@@ -270,6 +270,7 @@ export const experimentResultPropTypesShape = PropTypes.shape({
     "JPEG",
     "PNG",
     "GIF",
+    "HTML",
     "MARKDOWN",
     "MP3",
     "M4A",
-Original file line number
+Diff line change
@@ Expand Up @@
         "JPEG",
         "PNG",
         "GIF",
+        "HTML",
         "MARKDOWN",
         "MP3",
         "M4A",
@@ Expand Down @@