Merge branch 'master' into shahbaz/brand-logo-issue

openedx · Oct 11, 2023 · 7e3df49 · 7e3df49
2 parents 250c90f + 1478956
commit 7e3df49
Show file tree

Hide file tree

Showing 17 changed files with 153 additions and 145 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,9 +28,9 @@
   "dependencies": {
     "@edx/brand": "npm:@edx/brand-edx.org@^2.0.3",
     "@edx/browserslist-config": "^1.1.0",
-    "@edx/frontend-component-footer": "^12.0.0",
-    "@edx/frontend-enterprise-hotjar": "^1.4.0",
-    "@edx/frontend-platform": "^4.2.0",
+    "@edx/frontend-component-footer": "^12.2.1",
+    "@edx/frontend-enterprise-hotjar": "^2.0.0",
+    "@edx/frontend-platform": "^5.1.0",
     "@edx/paragon": "^20.44.0",
     "@edx/react-unit-test-utils": "^1.7.0",
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
@@ -65,7 +65,7 @@
     "react-intl": "^5.20.9",
     "react-pdf": "^5.5.0",
     "react-redux": "^7.2.4",
-    "react-router-dom": "5.3.3",
+    "react-router-dom": "6.15.0",
     "react-share": "^4.4.0",
     "react-zendesk": "^0.1.13",
     "redux": "4.1.1",

diff --git a/src/App.jsx b/src/App.jsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import { BrowserRouter as Router } from 'react-router-dom';
 import { Helmet } from 'react-helmet';
 
 import { useIntl } from '@edx/frontend-platform/i18n';
@@ -74,7 +73,7 @@ export const App = () => {
     }
   }, [authenticatedUser, loadData]);
   return (
-    <Router>
+    <>
       <Helmet>
         <title>{formatMessage(messages.pageTitle)}</title>
       </Helmet>
@@ -97,7 +96,7 @@ export const App = () => {
         <Footer logo={process.env.LOGO_POWERED_BY_OPEN_EDX_URL_SVG} />
         <ZendeskFab />
       </div>
-    </Router>
+    </>
   );
 };
 

diff --git a/src/App.test.jsx b/src/App.test.jsx
@@ -61,9 +61,6 @@ describe('App router component', () => {
       it('displays learner dashboard header', () => {
         expect(el.instance.findByType(LearnerDashboardHeader).length).toEqual(1);
       });
-      it('wraps the page in a browser router', () => {
-        expect(el.instance.el.type).toEqual('BrowserRouter');
-      });
       test('Footer logo drawn from env variable', () => {
         expect(el.instance.findByType(Footer)[0].props.logo).toEqual(logo);
       });

diff --git a/src/__snapshots__/App.test.jsx.snap b/src/__snapshots__/App.test.jsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`App router component component initialize failure snapshot 1`] = `
-<BrowserRouter>
+<Fragment>
   <HelmetWrapper
     defer={true}
     encodeSpecialCharacters={true}
@@ -28,11 +28,11 @@ exports[`App router component component initialize failure snapshot 1`] = `
     />
     <ZendeskFab />
   </div>
-</BrowserRouter>
+</Fragment>
 `;
 
 exports[`App router component component no network failure snapshot 1`] = `
-<BrowserRouter>
+<Fragment>
   <HelmetWrapper
     defer={true}
     encodeSpecialCharacters={true}
@@ -55,11 +55,11 @@ exports[`App router component component no network failure snapshot 1`] = `
     />
     <ZendeskFab />
   </div>
-</BrowserRouter>
+</Fragment>
 `;
 
 exports[`App router component component refresh failure snapshot 1`] = `
-<BrowserRouter>
+<Fragment>
   <HelmetWrapper
     defer={true}
     encodeSpecialCharacters={true}
@@ -86,5 +86,5 @@ exports[`App router component component refresh failure snapshot 1`] = `
     />
     <ZendeskFab />
   </div>
-</BrowserRouter>
+</Fragment>
 `;