Skip to content

Commit adb12b4

Browse files
authored
Merge pull request #1184 from openedx/aansari/sync-with-master
chore: sync with master
2 parents 1d0059e + 2216c1b commit adb12b4

7 files changed

Lines changed: 3252 additions & 2694 deletions

File tree

catalog-info.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ metadata:
1717
openedx.org/arch-interest-groups: ""
1818
# This can be multiple comma-separated projects.
1919
openedx.org/add-to-projects: "openedx:23"
20+
openedx.org/release: "master"
2021
spec:
2122
owner: group:2u-infinity
2223
type: 'service'

openedx.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.

package-lock.json

Lines changed: 3232 additions & 2669 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@
3030
"dependencies": {
3131
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
3232
"@edx/frontend-component-header": "^5.6.0",
33-
"@edx/frontend-platform": "8.1.2",
33+
"@edx/frontend-platform": "8.3.1",
3434
"@edx/openedx-atlas": "^0.6.0",
35-
"@fortawesome/fontawesome-svg-core": "6.6.0",
36-
"@fortawesome/free-brands-svg-icons": "6.6.0",
37-
"@fortawesome/free-regular-svg-icons": "6.6.0",
38-
"@fortawesome/free-solid-svg-icons": "6.6.0",
35+
"@fortawesome/fontawesome-svg-core": "6.7.2",
36+
"@fortawesome/free-brands-svg-icons": "6.7.2",
37+
"@fortawesome/free-regular-svg-icons": "6.7.2",
38+
"@fortawesome/free-solid-svg-icons": "6.7.2",
3939
"@fortawesome/react-fontawesome": "0.2.2",
4040
"@openedx/frontend-slot-footer": "^1.0.2",
4141
"@openedx/paragon": "^22.2.2",
4242
"@pact-foundation/pact": "^11.0.2",
4343
"@redux-devtools/extension": "3.3.0",
4444
"classnames": "2.5.1",
45-
"core-js": "3.38.1",
45+
"core-js": "3.40.0",
4646
"history": "5.3.0",
4747
"lodash.camelcase": "4.3.0",
4848
"lodash.get": "4.4.2",
@@ -53,8 +53,8 @@
5353
"react-dom": "17.0.2",
5454
"react-helmet": "6.1.0",
5555
"react-redux": "7.2.9",
56-
"react-router": "6.27.0",
57-
"react-router-dom": "6.27.0",
56+
"react-router": "6.29.0",
57+
"react-router-dom": "6.29.0",
5858
"redux": "4.2.1",
5959
"redux-logger": "3.0.6",
6060
"redux-saga": "1.3.0",
@@ -64,14 +64,14 @@
6464
"universal-cookie": "4.0.4"
6565
},
6666
"devDependencies": {
67-
"@commitlint/cli": "19.5.0",
68-
"@commitlint/config-angular": "19.5.0",
67+
"@commitlint/cli": "19.8.0",
68+
"@commitlint/config-angular": "19.8.0",
6969
"@edx/browserslist-config": "^1.1.1",
7070
"@edx/reactifex": "2.2.0",
71-
"@openedx/frontend-build": "14.1.5",
71+
"@openedx/frontend-build": "14.3.2",
7272
"@testing-library/jest-dom": "6.6.3",
7373
"@testing-library/react": "12.1.5",
74-
"glob": "11.0.0",
74+
"glob": "11.0.1",
7575
"reactifex": "1.1.1",
7676
"redux-mock-store": "1.5.5"
7777
}

src/profile-v2/__snapshots__/ProfilePage.test.jsx.snap

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ exports[`<ProfilePage /> Renders correctly in various states viewing other profi
4848
<div
4949
class="profile-avatar rounded-circle bg-light"
5050
>
51-
<iconmock
51+
<div
5252
aria-hidden="true"
5353
class="text-muted"
54+
data-testid="IconMock"
5455
focusable="false"
5556
role="img"
5657
viewbox="0 0 24 24"

src/profile/__snapshots__/ProfilePage.test.jsx.snap

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,10 @@ exports[`<ProfilePage /> Renders correctly in various states successfully redire
6565
Upload Photo
6666
</button>
6767
</div>
68-
<iconmock
68+
<div
6969
aria-hidden="true"
7070
class="text-muted"
71+
data-testid="IconMock"
7172
focusable="false"
7273
role="img"
7374
viewbox="0 0 24 24"
@@ -9997,9 +9998,10 @@ exports[`<ProfilePage /> Renders correctly in various states viewing other profi
99979998
<div
99989999
class="profile-avatar rounded-circle bg-light"
999910000
>
10000-
<iconmock
10001+
<div
1000110002
aria-hidden="true"
1000210003
class="text-muted"
10004+
data-testid="IconMock"
1000310005
focusable="false"
1000410006
role="img"
1000510007
viewbox="0 0 24 24"

src/routes/AppRoutes.jsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
import {
4-
AuthenticatedPageRoute,
5-
PageWrap,
6-
} from '@edx/frontend-platform/react';
3+
import { AuthenticatedPageRoute, PageWrap } from '@edx/frontend-platform/react';
74
import { Routes, Route, useNavigate } from 'react-router-dom';
85
import { ProfilePage, NotFoundPage } from '../profile';
96
import { ProfilePage as NewProfilePage, NotFoundPage as NewNotFoundPage } from '../profile-v2';

0 commit comments

Comments
 (0)