Skip to content

Commit 886d3b5

Browse files
authored
fix: updating frontend-base to 3.0.0 (#13)
Also locking package.json versions and updating associated @edx libraries
1 parent d689f1f commit 886d3b5

File tree

3 files changed

+78
-89
lines changed

3 files changed

+78
-89
lines changed

package-lock.json

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

package.json

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -31,51 +31,51 @@
3131
},
3232
"homepage": "https://github.com/edx/frontend-component-header-edx#readme",
3333
"devDependencies": {
34-
"@babel/cli": "^7.6.0",
35-
"@babel/core": "^7.6.0",
36-
"@babel/plugin-proposal-class-properties": "^7.5.5",
37-
"@babel/plugin-proposal-object-rest-spread": "^7.5.5",
38-
"@babel/preset-env": "^7.6.0",
39-
"@babel/preset-react": "^7.0.0",
40-
"@edx/frontend-analytics": "^2.0.0",
41-
"@edx/frontend-auth": "^6.0.1",
42-
"@edx/frontend-base": "^2.0.0",
43-
"@edx/frontend-i18n": "^3.0.2",
44-
"@edx/frontend-logging": "^3.0.1",
45-
"@edx/paragon": "^7.1.2",
46-
"babel-eslint": "^10.0.3",
47-
"babel-plugin-react-intl": "^4.1.18",
48-
"dotenv": "^8.1.0",
34+
"@babel/cli": "7.6.0",
35+
"@babel/core": "7.6.0",
36+
"@babel/plugin-proposal-class-properties": "7.5.5",
37+
"@babel/plugin-proposal-object-rest-spread": "7.5.5",
38+
"@babel/preset-env": "7.6.0",
39+
"@babel/preset-react": "7.0.0",
40+
"@edx/frontend-analytics": "3.0.0",
41+
"@edx/frontend-auth": "7.0.1",
42+
"@edx/frontend-base": "3.0.0",
43+
"@edx/frontend-i18n": "3.0.3",
44+
"@edx/frontend-logging": "3.0.1",
45+
"@edx/paragon": "7.1.4",
46+
"babel-eslint": "10.0.3",
47+
"babel-plugin-react-intl": "4.1.18",
48+
"dotenv": "8.1.0",
4949
"enzyme": "3.10.0",
5050
"enzyme-adapter-react-16": "1.14.0",
51-
"eslint": "^6.3.0",
52-
"eslint-config-edx": "^4.0.4",
53-
"jest": "^24.9.0",
54-
"parcel-bundler": "^1.12.3",
55-
"prop-types": "^15.7.2",
56-
"react": "^16.9.0",
57-
"react-dom": "^16.9.0",
58-
"react-redux": "^7.1.1",
59-
"react-router-dom": "^5.0.1",
60-
"react-test-renderer": "^16.9.0",
61-
"reactifex": "^1.1.1",
62-
"redux": "^4.0.4",
63-
"redux-saga": "^1.0.5",
64-
"sass": "^1.22.12",
65-
"semantic-release": "^15.13.24"
51+
"eslint": "6.3.0",
52+
"eslint-config-edx": "4.0.4",
53+
"jest": "24.9.0",
54+
"parcel-bundler": "1.12.3",
55+
"prop-types": "15.7.2",
56+
"react": "16.9.0",
57+
"react-dom": "16.9.0",
58+
"react-redux": "7.1.1",
59+
"react-router-dom": "5.0.1",
60+
"react-test-renderer": "16.9.0",
61+
"reactifex": "1.1.1",
62+
"redux": "4.0.4",
63+
"redux-saga": "1.0.5",
64+
"sass": "1.22.12",
65+
"semantic-release": "15.13.24"
66+
},
67+
"dependencies": {
68+
"babel-polyfill": "6.26.0",
69+
"react-responsive": "8.0.1",
70+
"react-transition-group": "4.3.0"
6671
},
6772
"peerDependencies": {
68-
"@edx/frontend-analytics": "^2.0.0",
69-
"@edx/frontend-base": "^2.0.0",
70-
"@edx/frontend-i18n": "^3.0.2",
73+
"@edx/frontend-analytics": "^3.0.0",
74+
"@edx/frontend-base": "^3.0.0",
75+
"@edx/frontend-i18n": "^3.0.3",
7176
"prop-types": "^15.7.2",
7277
"react": "^16.9.0"
7378
},
74-
"dependencies": {
75-
"babel-polyfill": "^6.26.0",
76-
"react-responsive": "^8.0.1",
77-
"react-transition-group": "^4.3.0"
78-
},
7979
"jest": {
8080
"transform": {
8181
"^.+\\.jsx?$": "babel-jest"

src/SiteHeader.jsx

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useContext } from 'react';
22
import Responsive from 'react-responsive';
33
import { injectIntl, intlShape } from '@edx/frontend-i18n';
44
import { sendTrackEvent } from '@edx/frontend-analytics';
5-
import { App, AppContext, APP_CONFIGURED } from '@edx/frontend-base';
5+
import { App, AppContext } from '@edx/frontend-base';
66

77
import DesktopHeader from './DesktopHeader';
88
import MobileHeader from './MobileHeader';
@@ -11,15 +11,13 @@ import LogoSVG from './logo.svg';
1111

1212
import messages from './SiteHeader.messages';
1313

14-
App.subscribe(APP_CONFIGURED, () => {
15-
App.requireConfig([
16-
'LMS_BASE_URL',
17-
'LOGOUT_URL',
18-
'LOGIN_URL',
19-
'MARKETING_SITE_BASE_URL',
20-
'ORDER_HISTORY_URL',
21-
], 'Header component');
22-
});
14+
App.requireConfig([
15+
'LMS_BASE_URL',
16+
'LOGOUT_URL',
17+
'LOGIN_URL',
18+
'MARKETING_SITE_BASE_URL',
19+
'ORDER_HISTORY_URL',
20+
], 'Header component');
2321

2422
function SiteHeader({ intl }) {
2523
const { authenticatedUser, config } = useContext(AppContext);

0 commit comments

Comments
 (0)