diff --git a/package-lock.json b/package-lock.json index 6cbb4a75c..e8528ef0a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1426,9 +1426,9 @@ "dev": true }, "@edx/frontend-analytics": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@edx/frontend-analytics/-/frontend-analytics-2.0.0.tgz", - "integrity": "sha512-dj01bUVFA0sIlxtMH1YhQrVjWdmmiUeDIR3QqSXAxU2vwX2F4bsYUm8t0kCyg+8CjfkTcuZvyHHfwvQwlFOx2g==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@edx/frontend-analytics/-/frontend-analytics-3.0.0.tgz", + "integrity": "sha512-+/4ILACcNBkscq4r+ZJvx/hsUqZu9c3Sqb4nm2TyAGqEKYSw010pE6Y4d6wi4tkXW6R6wc3VA2BnXdw5g7gsrA==", "dev": true, "requires": { "form-urlencoded": "^3.0.0", @@ -1436,9 +1436,9 @@ } }, "@edx/frontend-auth": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@edx/frontend-auth/-/frontend-auth-6.0.1.tgz", - "integrity": "sha512-wg1i2wPTnY5NUrRMaNeAYSkjaZxZ597p3Np57+8BckBI5JwDjzyaWAEMZmyc9jZR6X4xr5KCseD7nBOzpI9Ppw==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@edx/frontend-auth/-/frontend-auth-7.0.1.tgz", + "integrity": "sha512-oElicVn8fbSAPEc79ivObiYgRTv62aNXP8y+utGBHQCNDi6N7bA4hXcKLjvz25hExmlzJdIR4v5IOLZiVMB5VQ==", "dev": true, "requires": { "@edx/frontend-logging": "^2.0.1", @@ -1460,9 +1460,9 @@ } }, "@edx/frontend-base": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@edx/frontend-base/-/frontend-base-2.0.0.tgz", - "integrity": "sha512-wgckFePSzFHyoTK+NTqkKSCW4dKCY11PypSNT3yDLnPdV4R5L6RqvDQr6ovfeJ/scx0R0EY89j9OV/xcvWIPSw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@edx/frontend-base/-/frontend-base-3.0.0.tgz", + "integrity": "sha512-mNswx2m74lydo66lAYvQm7z1BuP1FpdEjRpjy3S2oBaTw3ngtCzyvqEJrtNHpebIf4ZWiW3wXRu0cSexinKAYQ==", "dev": true, "requires": { "babel-polyfill": "6.26.0", @@ -1477,9 +1477,9 @@ } }, "@edx/frontend-i18n": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@edx/frontend-i18n/-/frontend-i18n-3.0.2.tgz", - "integrity": "sha512-K0jdSjwM3jO76HL3Dn8oGb15/40yr2IMcz5PVrHx7dxi6bvg9cWBf7C5Zbq4bZ515ZTUbZLrPMDk61lFkmcUzQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@edx/frontend-i18n/-/frontend-i18n-3.0.3.tgz", + "integrity": "sha512-1oBPba9xd/GK0hSBPhTdNGtHA+76j8sWJxRD9gQ+GsHLHF7Z75GsX+Ls6pB+fTNi9tjqaVWQLsA9rMGcj92hqQ==", "dev": true, "requires": { "@cospired/i18n-iso-languages": "2.0.2", @@ -1511,9 +1511,9 @@ "dev": true }, "@edx/paragon": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-7.1.2.tgz", - "integrity": "sha512-XcjDRW+gFv4GK7XLLsX3jDwQf7dFzTYCoqI1rrOKSZQlsRWSgMR+YHkEQkU0bjVNb7SnvWS4gEO9KuGTOHCkcw==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-7.1.4.tgz", + "integrity": "sha512-lAOF+rPwC86xAkz78SanVWVYIv9jd7w00qt5iXpo+szsY5vkZvq48L/yCbjDfSEm6TvA6PqTgXopmJBpJ6ny6w==", "dev": true, "requires": { "@fortawesome/fontawesome-svg-core": "^1.2.21", @@ -1526,8 +1526,6 @@ "font-awesome": "^4.7.0", "mailto-link": "^1.0.0", "prop-types": "^15.7.2", - "react": "^16.9.0", - "react-dom": "^16.9.0", "react-proptype-conditional-require": "^1.0.4", "react-responsive": "^6.1.1", "react-transition-group": "^4.0.0", @@ -1548,36 +1546,35 @@ } }, "@fortawesome/fontawesome-common-types": { - "version": "0.2.22", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.22.tgz", - "integrity": "sha512-QmEuZsipX5/cR9JOg0fsTN4Yr/9lieYWM8AQpmRa0eIfeOcl/HLYoEa366BCGRSrgNJEexuvOgbq9jnJ22IY5g==", + "version": "0.2.25", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.25.tgz", + "integrity": "sha512-3RuZPDuuPELd7RXtUqTCfed14fcny9UiPOkdr2i+cYxBoTOfQgxcDoq77fHiiHcgWuo1LoBUpvGxFF1H/y7s3Q==", "dev": true }, "@fortawesome/fontawesome-svg-core": { - "version": "1.2.22", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.22.tgz", - "integrity": "sha512-Q941E4x8UfnMH3308n0qrgoja+GoqyiV846JTLoCcCWAKokLKrixCkq6RDBs8r+TtAWaLUrBpI+JFxQNX/WNPQ==", + "version": "1.2.25", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.25.tgz", + "integrity": "sha512-MotKnn53JKqbkLQiwcZSBJVYtTgIKFbh7B8+kd05TSnfKYPFmjKKI59o2fpz5t0Hzl35vVGU6+N4twoOpZUrqA==", "dev": true, "requires": { - "@fortawesome/fontawesome-common-types": "^0.2.22" + "@fortawesome/fontawesome-common-types": "^0.2.25" } }, "@fortawesome/free-solid-svg-icons": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.10.2.tgz", - "integrity": "sha512-9Os/GRUcy+iVaznlg8GKcPSQFpIQpAg14jF0DWsMdnpJfIftlvfaQCWniR/ex9FoOpSEOrlXqmUCFL+JGeciuA==", + "version": "5.11.2", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.11.2.tgz", + "integrity": "sha512-zBue4i0PAZJUXOmLBBvM7L0O7wmsDC8dFv9IhpW5QL4kT9xhhVUsYg/LX1+5KaukWq4/cbDcKT+RT1aRe543sg==", "dev": true, "requires": { - "@fortawesome/fontawesome-common-types": "^0.2.22" + "@fortawesome/fontawesome-common-types": "^0.2.25" } }, "@fortawesome/react-fontawesome": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.4.tgz", - "integrity": "sha512-GwmxQ+TK7PEdfSwvxtGnMCqrfEm0/HbRHArbUudsYiy9KzVCwndxa2KMcfyTQ8El0vROrq8gOOff09RF1oQe8g==", + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.5.tgz", + "integrity": "sha512-WYDKTgyAWOncujWhhzhW7k8sgO5Eo2pZTUL51yNzSQNBUwwr6rNKg/JUSE3iebaU1XShHw74aKc1kJ+jvtRNew==", "dev": true, "requires": { - "humps": "^2.0.1", "prop-types": "^15.5.10" } }, @@ -7266,9 +7263,9 @@ "dev": true }, "handlebars": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.2.0.tgz", - "integrity": "sha512-Kb4xn5Qh1cxAKvQnzNWZ512DhABzyFNmsaJf3OAkWNa4NkaqWcNI8Tao8Tasi0/F4JD9oyG0YxuFyvyR57d+Gw==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.4.0.tgz", + "integrity": "sha512-xkRtOt3/3DzTKMOt3xahj2M/EqNhY988T+imYSlMgs5fVhLN2fmKVVj0LtEGmb+3UUYV5Qmm1052Mm3dIQxOvw==", "dev": true, "requires": { "neo-async": "^2.6.0", @@ -7576,12 +7573,6 @@ "debug": "^3.1.0" } }, - "humps": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/humps/-/humps-2.0.1.tgz", - "integrity": "sha1-3QLqYIG9BWjcXQcxhEY5V7qe+ao=", - "dev": true - }, "hyphenate-style-name": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz", diff --git a/package.json b/package.json index b42fe6ef1..7c6355461 100644 --- a/package.json +++ b/package.json @@ -29,51 +29,51 @@ }, "homepage": "https://github.com/edx/frontend-component-header#readme", "devDependencies": { - "@babel/cli": "^7.6.0", - "@babel/core": "^7.6.0", - "@babel/plugin-proposal-class-properties": "^7.5.5", - "@babel/plugin-proposal-object-rest-spread": "^7.5.5", - "@babel/preset-env": "^7.6.0", - "@babel/preset-react": "^7.0.0", - "@edx/frontend-analytics": "^2.0.0", - "@edx/frontend-auth": "^6.0.1", - "@edx/frontend-base": "^2.0.0", - "@edx/frontend-i18n": "^3.0.2", - "@edx/frontend-logging": "^3.0.1", - "@edx/paragon": "^7.1.2", - "babel-eslint": "^10.0.3", - "babel-plugin-react-intl": "^4.1.18", - "dotenv": "^8.1.0", + "@babel/cli": "7.6.0", + "@babel/core": "7.6.0", + "@babel/plugin-proposal-class-properties": "7.5.5", + "@babel/plugin-proposal-object-rest-spread": "7.5.5", + "@babel/preset-env": "7.6.0", + "@babel/preset-react": "7.0.0", + "@edx/frontend-analytics": "3.0.0", + "@edx/frontend-auth": "7.0.1", + "@edx/frontend-base": "3.0.0", + "@edx/frontend-i18n": "3.0.3", + "@edx/frontend-logging": "3.0.1", + "@edx/paragon": "7.1.4", + "babel-eslint": "10.0.3", + "babel-plugin-react-intl": "4.1.18", + "dotenv": "8.1.0", "enzyme": "3.10.0", "enzyme-adapter-react-16": "1.14.0", - "eslint": "^6.3.0", - "eslint-config-edx": "^4.0.4", - "jest": "^24.9.0", - "parcel-bundler": "^1.12.3", - "prop-types": "^15.7.2", - "react": "^16.9.0", - "react-dom": "^16.9.0", - "react-redux": "^7.1.1", - "react-router-dom": "^5.0.1", - "react-test-renderer": "^16.9.0", - "reactifex": "^1.1.1", - "redux": "^4.0.4", - "redux-saga": "^1.0.5", - "sass": "^1.22.12", - "semantic-release": "^15.13.24" + "eslint": "6.3.0", + "eslint-config-edx": "4.0.4", + "jest": "24.9.0", + "parcel-bundler": "1.12.3", + "prop-types": "15.7.2", + "react": "16.9.0", + "react-dom": "16.9.0", + "react-redux": "7.1.1", + "react-router-dom": "5.0.1", + "react-test-renderer": "16.9.0", + "reactifex": "1.1.1", + "redux": "4.0.4", + "redux-saga": "1.0.5", + "sass": "1.22.12", + "semantic-release": "15.13.24" + }, + "dependencies": { + "babel-polyfill": "6.26.0", + "react-responsive": "8.0.1", + "react-transition-group": "4.3.0" }, "peerDependencies": { - "@edx/frontend-analytics": "^2.0.0", - "@edx/frontend-base": "^2.0.0", - "@edx/frontend-i18n": "^3.0.2", + "@edx/frontend-analytics": "^3.0.0", + "@edx/frontend-base": "^3.0.0", + "@edx/frontend-i18n": "^3.0.3", "prop-types": "^15.7.2", "react": "^16.9.0" }, - "dependencies": { - "babel-polyfill": "^6.26.0", - "react-responsive": "^8.0.1", - "react-transition-group": "^4.3.0" - }, "jest": { "transform": { "^.+\\.jsx?$": "babel-jest" diff --git a/src/SiteHeader.jsx b/src/SiteHeader.jsx index 2e5abd5b2..2303d16e2 100644 --- a/src/SiteHeader.jsx +++ b/src/SiteHeader.jsx @@ -1,7 +1,7 @@ import React, { useContext } from 'react'; import Responsive from 'react-responsive'; import { injectIntl, intlShape } from '@edx/frontend-i18n'; -import { App, AppContext, APP_CONFIGURED } from '@edx/frontend-base'; +import { App, AppContext } from '@edx/frontend-base'; import DesktopHeader from './DesktopHeader'; import MobileHeader from './MobileHeader'; @@ -10,14 +10,12 @@ import LogoSVG from './logo.svg'; import messages from './SiteHeader.messages'; -App.subscribe(APP_CONFIGURED, () => { - App.requireConfig([ - 'LMS_BASE_URL', - 'LOGOUT_URL', - 'LOGIN_URL', - 'SITE_NAME', - ], 'Header component'); -}); +App.requireConfig([ + 'LMS_BASE_URL', + 'LOGOUT_URL', + 'LOGIN_URL', + 'SITE_NAME', +], 'Header component'); function SiteHeader({ intl }) { const { authenticatedUser, config } = useContext(AppContext);