From 3c5fb46a4d1a00186348f72234e11f9791083ded Mon Sep 17 00:00:00 2001 From: David Joy Date: Mon, 7 Dec 2020 17:50:06 -0500 Subject: [PATCH] =?UTF-8?q?Update=20MFE=20to=20use=20the=20new=20=E2=80=9C?= =?UTF-8?q?brand-openedx=E2=80=9D=20repository.=20(#283)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update MFE to use the new “brand-openedx” repository. This will allow the MFE to be re-branded by overriding this default implementation. More detail here: https://github.com/edx/brand-openedx * Removing unused frontend-component-header module. This app doesn’t use frontend-component-header. That it was a dependency is confusing and led me to believe I needed to wait for its rebrand to continue - not so. Removing the unused dependency. * Adding quick comment describing the structure of gated_content * Fixing course exit styling * Changing LinkedIn icon * fix: fix Instructor toolbar button styling * Bumping footer, platform, and paragon versions. * Using configured logo and favicon. Co-authored-by: Carla Duarte --- .env | 8 +- .env.development | 4 + .env.test | 5 + package-lock.json | 924 +++++++++++------- package.json | 14 +- public/index.html | 2 +- src/assets/favicon.ico | Bin 34894 -> 0 bytes src/course-header/Header.jsx | 3 +- src/course-header/assets/logo.svg | 15 - .../course/course-exit/CourseCelebration.jsx | 16 +- .../course/course-exit/CourseNonPassing.jsx | 4 +- src/courseware/data/api.js | 9 + src/index.jsx | 3 - src/index.scss | 7 +- src/instructor-toolbar/InstructorToolbar.jsx | 6 +- .../masquerade-widget/MasqueradeWidget.jsx | 2 +- 16 files changed, 594 insertions(+), 428 deletions(-) delete mode 100644 src/assets/favicon.ico delete mode 100644 src/course-header/assets/logo.svg diff --git a/.env b/.env index 005f74a3..a8774b81 100644 --- a/.env +++ b/.env @@ -5,18 +5,22 @@ CREDENTIALS_BASE_URL=null CSRF_TOKEN_API_PATH=null ENTERPRISE_LEARNER_PORTAL_HOSTNAME=null ECOMMERCE_BASE_URL=null -INSIGHTS_BASE_URL= +INSIGHTS_BASE_URL=null LANGUAGE_PREFERENCE_COOKIE_NAME=null LMS_BASE_URL=null LOGIN_URL=null LOGOUT_URL=null +LOGO_URL=null +LOGO_TRADEMARK_URL=null +LOGO_WHITE_URL=null +FAVICON_URL=null MARKETING_SITE_BASE_URL=null ORDER_HISTORY_URL=null REFRESH_ACCESS_TOKEN_ENDPOINT=null SEGMENT_KEY=null SITE_NAME=null SOCIAL_UTM_MILESTONE_CAMPAIGN=null -STUDIO_BASE_URL= +STUDIO_BASE_URL=null SUPPORT_URL=null SUPPORT_URL_CALCULATOR_MATH=null SUPPORT_URL_ID_VERIFICATION=null diff --git a/.env.development b/.env.development index fde4b076..3475c068 100644 --- a/.env.development +++ b/.env.development @@ -9,6 +9,10 @@ LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference' LMS_BASE_URL='http://localhost:18000' LOGIN_URL='http://localhost:18000/login' LOGOUT_URL='http://localhost:18000/logout' +LOGO_URL=https://edx-cdn.org/v3/default/logo.svg +LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg +LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg +FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico MARKETING_SITE_BASE_URL='http://localhost:18000' ORDER_HISTORY_URL='http://localhost:1996/orders' PORT=2000 diff --git a/.env.test b/.env.test index cabc027f..09d05b40 100644 --- a/.env.test +++ b/.env.test @@ -4,10 +4,15 @@ BASE_URL='http://localhost:2000' CREDENTIALS_BASE_URL='http://localhost:18150' CSRF_TOKEN_API_PATH='/csrf/api/v1/token' ECOMMERCE_BASE_URL='http://localhost:18130' +ENTERPRISE_LEARNER_PORTAL_HOSTNAME='localhost:8734' LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference' LMS_BASE_URL='http://localhost:18000' LOGIN_URL='http://localhost:18000/login' LOGOUT_URL='http://localhost:18000/logout' +LOGO_URL=https://edx-cdn.org/v3/default/logo.svg +LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg +LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg +FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico MARKETING_SITE_BASE_URL='http://localhost:18000' ORDER_HISTORY_URL='http://localhost:1996/orders' PORT=2000 diff --git a/package-lock.json b/package-lock.json index 13157d40..90d86237 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,9 +39,9 @@ } }, "@babel/compat-data": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz", - "integrity": "sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz", + "integrity": "sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==", "dev": true }, "@babel/core": { @@ -160,9 +160,9 @@ } }, "@babel/types": { - "version": "7.12.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", - "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz", + "integrity": "sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -209,12 +209,12 @@ } }, "@babel/helper-member-expression-to-functions": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz", - "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz", + "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==", "dev": true, "requires": { - "@babel/types": "^7.12.1" + "@babel/types": "^7.12.7" } }, "@babel/helper-replace-supers": { @@ -230,32 +230,32 @@ } }, "@babel/parser": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz", - "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz", + "integrity": "sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==", "dev": true }, "@babel/traverse": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz", - "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.7.tgz", + "integrity": "sha512-nMWaqsQEeSvMNypswUDzjqQ+0rR6pqCtoQpsqGJC4/Khm9cISwPTSpai57F6/jDaOoEGz8yE/WxcO3PV6tKSmQ==", "dev": true, "requires": { "@babel/code-frame": "^7.10.4", "@babel/generator": "^7.12.5", "@babel/helper-function-name": "^7.10.4", "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.12.5", - "@babel/types": "^7.12.5", + "@babel/parser": "^7.12.7", + "@babel/types": "^7.12.7", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.19" } }, "@babel/types": { - "version": "7.12.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", - "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz", + "integrity": "sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -264,9 +264,9 @@ } }, "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -287,13 +287,12 @@ } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz", - "integrity": "sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz", + "integrity": "sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.10.4", - "@babel/helper-regex": "^7.10.4", "regexpu-core": "^4.7.1" } }, @@ -318,9 +317,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.12.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", - "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz", + "integrity": "sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -407,15 +406,6 @@ "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", "dev": true }, - "@babel/helper-regex": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz", - "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==", - "dev": true, - "requires": { - "lodash": "^4.17.19" - } - }, "@babel/helper-remap-async-to-generator": { "version": "7.12.1", "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz", @@ -428,9 +418,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.12.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", - "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz", + "integrity": "sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -472,9 +462,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.12.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", - "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz", + "integrity": "sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -597,9 +587,9 @@ } }, "@babel/plugin-proposal-numeric-separator": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz", - "integrity": "sha512-UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz", + "integrity": "sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4", @@ -628,9 +618,9 @@ } }, "@babel/plugin-proposal-optional-chaining": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz", - "integrity": "sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz", + "integrity": "sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4", @@ -814,9 +804,9 @@ } }, "@babel/types": { - "version": "7.12.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", - "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz", + "integrity": "sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -872,12 +862,12 @@ } }, "@babel/helper-member-expression-to-functions": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz", - "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz", + "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==", "dev": true, "requires": { - "@babel/types": "^7.12.1" + "@babel/types": "^7.12.7" } }, "@babel/helper-replace-supers": { @@ -893,32 +883,32 @@ } }, "@babel/parser": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz", - "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz", + "integrity": "sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==", "dev": true }, "@babel/traverse": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz", - "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.7.tgz", + "integrity": "sha512-nMWaqsQEeSvMNypswUDzjqQ+0rR6pqCtoQpsqGJC4/Khm9cISwPTSpai57F6/jDaOoEGz8yE/WxcO3PV6tKSmQ==", "dev": true, "requires": { "@babel/code-frame": "^7.10.4", "@babel/generator": "^7.12.5", "@babel/helper-function-name": "^7.10.4", "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.12.5", - "@babel/types": "^7.12.5", + "@babel/parser": "^7.12.7", + "@babel/types": "^7.12.7", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.19" } }, "@babel/types": { - "version": "7.12.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", - "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz", + "integrity": "sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -927,9 +917,9 @@ } }, "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -1056,12 +1046,12 @@ } }, "@babel/helper-member-expression-to-functions": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz", - "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz", + "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==", "dev": true, "requires": { - "@babel/types": "^7.12.1" + "@babel/types": "^7.12.7" } }, "@babel/helper-module-imports": { @@ -1112,32 +1102,32 @@ } }, "@babel/parser": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz", - "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz", + "integrity": "sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==", "dev": true }, "@babel/traverse": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz", - "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.7.tgz", + "integrity": "sha512-nMWaqsQEeSvMNypswUDzjqQ+0rR6pqCtoQpsqGJC4/Khm9cISwPTSpai57F6/jDaOoEGz8yE/WxcO3PV6tKSmQ==", "dev": true, "requires": { "@babel/code-frame": "^7.10.4", "@babel/generator": "^7.12.5", "@babel/helper-function-name": "^7.10.4", "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.12.5", - "@babel/types": "^7.12.5", + "@babel/parser": "^7.12.7", + "@babel/types": "^7.12.7", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.19" } }, "@babel/types": { - "version": "7.12.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", - "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz", + "integrity": "sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -1146,9 +1136,9 @@ } }, "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -1192,12 +1182,12 @@ } }, "@babel/helper-member-expression-to-functions": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz", - "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz", + "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==", "dev": true, "requires": { - "@babel/types": "^7.12.1" + "@babel/types": "^7.12.7" } }, "@babel/helper-module-imports": { @@ -1248,32 +1238,32 @@ } }, "@babel/parser": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz", - "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz", + "integrity": "sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==", "dev": true }, "@babel/traverse": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz", - "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.7.tgz", + "integrity": "sha512-nMWaqsQEeSvMNypswUDzjqQ+0rR6pqCtoQpsqGJC4/Khm9cISwPTSpai57F6/jDaOoEGz8yE/WxcO3PV6tKSmQ==", "dev": true, "requires": { "@babel/code-frame": "^7.10.4", "@babel/generator": "^7.12.5", "@babel/helper-function-name": "^7.10.4", "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.12.5", - "@babel/types": "^7.12.5", + "@babel/parser": "^7.12.7", + "@babel/types": "^7.12.7", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.19" } }, "@babel/types": { - "version": "7.12.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", - "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz", + "integrity": "sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -1282,9 +1272,9 @@ } }, "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -1329,12 +1319,12 @@ } }, "@babel/helper-member-expression-to-functions": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz", - "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz", + "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==", "dev": true, "requires": { - "@babel/types": "^7.12.1" + "@babel/types": "^7.12.7" } }, "@babel/helper-module-imports": { @@ -1385,32 +1375,32 @@ } }, "@babel/parser": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz", - "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz", + "integrity": "sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==", "dev": true }, "@babel/traverse": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz", - "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.7.tgz", + "integrity": "sha512-nMWaqsQEeSvMNypswUDzjqQ+0rR6pqCtoQpsqGJC4/Khm9cISwPTSpai57F6/jDaOoEGz8yE/WxcO3PV6tKSmQ==", "dev": true, "requires": { "@babel/code-frame": "^7.10.4", "@babel/generator": "^7.12.5", "@babel/helper-function-name": "^7.10.4", "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.12.5", - "@babel/types": "^7.12.5", + "@babel/parser": "^7.12.7", + "@babel/types": "^7.12.7", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.19" } }, "@babel/types": { - "version": "7.12.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", - "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz", + "integrity": "sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -1419,9 +1409,9 @@ } }, "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -1463,12 +1453,12 @@ } }, "@babel/helper-member-expression-to-functions": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz", - "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz", + "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==", "dev": true, "requires": { - "@babel/types": "^7.12.1" + "@babel/types": "^7.12.7" } }, "@babel/helper-module-imports": { @@ -1519,32 +1509,32 @@ } }, "@babel/parser": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz", - "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz", + "integrity": "sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==", "dev": true }, "@babel/traverse": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz", - "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.7.tgz", + "integrity": "sha512-nMWaqsQEeSvMNypswUDzjqQ+0rR6pqCtoQpsqGJC4/Khm9cISwPTSpai57F6/jDaOoEGz8yE/WxcO3PV6tKSmQ==", "dev": true, "requires": { "@babel/code-frame": "^7.10.4", "@babel/generator": "^7.12.5", "@babel/helper-function-name": "^7.10.4", "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.12.5", - "@babel/types": "^7.12.5", + "@babel/parser": "^7.12.7", + "@babel/types": "^7.12.7", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.19" } }, "@babel/types": { - "version": "7.12.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", - "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz", + "integrity": "sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -1553,9 +1543,9 @@ } }, "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -1615,12 +1605,12 @@ } }, "@babel/helper-member-expression-to-functions": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz", - "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz", + "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==", "dev": true, "requires": { - "@babel/types": "^7.12.1" + "@babel/types": "^7.12.7" } }, "@babel/helper-replace-supers": { @@ -1636,32 +1626,32 @@ } }, "@babel/parser": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz", - "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz", + "integrity": "sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==", "dev": true }, "@babel/traverse": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz", - "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.7.tgz", + "integrity": "sha512-nMWaqsQEeSvMNypswUDzjqQ+0rR6pqCtoQpsqGJC4/Khm9cISwPTSpai57F6/jDaOoEGz8yE/WxcO3PV6tKSmQ==", "dev": true, "requires": { "@babel/code-frame": "^7.10.4", "@babel/generator": "^7.12.5", "@babel/helper-function-name": "^7.10.4", "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.12.5", - "@babel/types": "^7.12.5", + "@babel/parser": "^7.12.7", + "@babel/types": "^7.12.7", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.19" } }, "@babel/types": { - "version": "7.12.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", - "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz", + "integrity": "sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -1670,9 +1660,9 @@ } }, "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -1729,24 +1719,24 @@ } }, "@babel/plugin-transform-react-jsx": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.5.tgz", - "integrity": "sha512-2xkcPqqrYiOQgSlM/iwto1paPijjsDbUynN13tI6bosDz/jOW3CRzYguIE8wKX32h+msbBM22Dv5fwrFkUOZjQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.7.tgz", + "integrity": "sha512-YFlTi6MEsclFAPIDNZYiCRbneg1MFGao9pPG9uD5htwE0vDbPaMUMeYd6itWjw7K4kro4UbdQf3ljmFl9y48dQ==", "dev": true, "requires": { "@babel/helper-builder-react-jsx": "^7.10.4", - "@babel/helper-builder-react-jsx-experimental": "^7.12.1", + "@babel/helper-builder-react-jsx-experimental": "^7.12.4", "@babel/helper-plugin-utils": "^7.10.4", "@babel/plugin-syntax-jsx": "^7.12.1" } }, "@babel/plugin-transform-react-jsx-development": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.5.tgz", - "integrity": "sha512-1JJusg3iPgsZDthyWiCr3KQiGs31ikU/mSf2N2dSYEAO0GEImmVUbWf0VoSDGDFTAn5Dj4DUiR6SdIXHY7tELA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.7.tgz", + "integrity": "sha512-Rs3ETtMtR3VLXFeYRChle5SsP/P9Jp/6dsewBQfokDSzKJThlsuFcnzLTDRALiUmTC48ej19YD9uN1mupEeEDg==", "dev": true, "requires": { - "@babel/helper-builder-react-jsx-experimental": "^7.12.1", + "@babel/helper-builder-react-jsx-experimental": "^7.12.4", "@babel/helper-plugin-utils": "^7.10.4", "@babel/plugin-syntax-jsx": "^7.12.1" } @@ -1817,13 +1807,12 @@ } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz", - "integrity": "sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz", + "integrity": "sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-regex": "^7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-template-literals": { @@ -2058,6 +2047,11 @@ "resolved": "https://registry.npmjs.org/@cospired/i18n-iso-languages/-/i18n-iso-languages-2.1.2.tgz", "integrity": "sha512-XylKOsWRyQm9sNanZnppRORXTLaL34uThyBQpTFwOGAYvNg9PeYsyTTfLA1FTCh02RV+kiwt/O/y14DR/OqpWg==" }, + "@edx/brand": { + "version": "npm:@edx/brand-openedx@1.1.0", + "resolved": "https://registry.npmjs.org/@edx/brand-openedx/-/brand-openedx-1.1.0.tgz", + "integrity": "sha512-ne2ZKF1r0akkt0rEzCAQAk4cTDTI2GiWCpc+T7ldQpw9X57OnUB16dKsFNe40C9uEjL5h3Ps/ZsFM5dm4cIkEQ==" + }, "@edx/eslint-config": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/@edx/eslint-config/-/eslint-config-1.1.5.tgz", @@ -2065,9 +2059,9 @@ "dev": true }, "@edx/frontend-build": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/@edx/frontend-build/-/frontend-build-5.4.0.tgz", - "integrity": "sha512-VFkgyDBj0W3p8Iu15YXPB3Mih1REL4OoWI3cbhUu3kqsCaQaWZYj1SgvFDqV/Q4milIVAXLCSafa1upLRFs7Hg==", + "version": "5.5.1", + "resolved": "https://registry.npmjs.org/@edx/frontend-build/-/frontend-build-5.5.1.tgz", + "integrity": "sha512-qltHAJMuHcEJJep2kq+ND7cIjK8PZKkHbLQlc+T5DvgAppOsvnidU0NdXK+eTY+cKVz5s2ysmgs9mb4g0ugYHA==", "dev": true, "requires": { "@babel/cli": "7.10.5", @@ -2207,9 +2201,9 @@ } }, "@edx/frontend-component-footer": { - "version": "10.0.11", - "resolved": "https://registry.npmjs.org/@edx/frontend-component-footer/-/frontend-component-footer-10.0.11.tgz", - "integrity": "sha512-Az8E2h0d5DYz+zp+x6yvc+W0uzGaDhSsTd1BE0pcJvcv1EaNPZxuxKrEtsA8bUFXRLNhzt9nWp/DIRG9kivNxA==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/@edx/frontend-component-footer/-/frontend-component-footer-10.1.0.tgz", + "integrity": "sha512-gPgE78/nWSARRwmQW9cUyYLQk8Lh+h4iwZRk8gUryr/do9jA1K2xdpjUA0Fm2S8HOG7W9Yc+GCYxxOgS6QgvIg==", "requires": { "@fortawesome/fontawesome-svg-core": "1.2.30", "@fortawesome/free-brands-svg-icons": "5.8.2", @@ -2260,16 +2254,6 @@ } } }, - "@edx/frontend-component-header": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@edx/frontend-component-header/-/frontend-component-header-2.0.6.tgz", - "integrity": "sha512-v50qYXX56Qswo2yF5JlUL7mzauv7scTwQ7EoJz5/PBMszXVWwUPy5zh2ynkrPhpKHY4E5MtO7no4w7YCcNvjfg==", - "requires": { - "babel-polyfill": "6.26.0", - "react-responsive": "8.0.3", - "react-transition-group": "4.3.0" - } - }, "@edx/frontend-enterprise": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/@edx/frontend-enterprise/-/frontend-enterprise-4.2.3.tgz", @@ -2296,17 +2280,20 @@ } }, "@edx/frontend-platform": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-1.5.4.tgz", - "integrity": "sha512-kRszU9CqW+qQysNnBlopl2/OXF/dptnnACFp/Q+sAvStSqTbYzrMgta6pQQEdwPDZgLLxkE0ba3354SKL0seVg==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-1.8.0.tgz", + "integrity": "sha512-R4LGBKaSBWC9xxG3eTN78zw5CkBes4xQgazt78ApgenxzIoun+y0tdWyc/8PpjbKmyj0nACpsfARyeQy4rnGKA==", "requires": { "@cospired/i18n-iso-languages": "2.1.2", "axios": "0.18.1", + "axios-cache-adapter": "^2.5.0", "form-urlencoded": "4.1.4", "glob": "7.1.6", "history": "4.10.1", "i18n-iso-countries": "4.3.1", "jwt-decode": "2.2.0", + "localforage": "^1.9.0", + "localforage-memoryStorageDriver": "^0.9.2", "lodash.camelcase": "4.3.0", "lodash.memoize": "4.1.2", "lodash.merge": "4.6.2", @@ -2317,9 +2304,9 @@ } }, "@edx/paragon": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-12.0.5.tgz", - "integrity": "sha512-5DhpXa1DktxOX2t7hdVBMYTWr0gn/30JKBq/ohjpCrnAbMfo6fM9MZkVlAtYKPmLOecxebL5ATTAKeP/T+WP3w==", + "version": "12.3.1", + "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-12.3.1.tgz", + "integrity": "sha512-MRE2tS3+ej6YkmC6pBlENHIj06mpYhXrcsawRCptUe64JN+CBWtZkmeNfBymfpNqdW/DP1FGgwIcxodsJkxR+A==", "requires": { "@fortawesome/fontawesome-svg-core": "^1.2.30", "@fortawesome/free-solid-svg-icons": "^5.14.0", @@ -2352,23 +2339,13 @@ "requires": { "@fortawesome/fontawesome-common-types": "^0.2.32" } - }, - "react-responsive": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/react-responsive/-/react-responsive-6.1.2.tgz", - "integrity": "sha512-AXentVC/kN3KED9zhzJv2pu4vZ0i6cSHdTtbCScVV1MT6F5KXaG2qs5D7WLmhdaOvmiMX8UfmS4ZSO+WPwDt4g==", - "requires": { - "hyphenate-style-name": "^1.0.0", - "matchmediaquery": "^0.3.0", - "prop-types": "^15.6.1" - } } } }, "@formatjs/ecma402-abstract": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.4.0.tgz", - "integrity": "sha512-Mv027hcLFjE45K8UJ8PjRpdDGfR0aManEFj1KzoN8zXNveHGEygpZGfFf/FTTMl+QEVSrPAUlyxaCApvmv47AQ==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.5.0.tgz", + "integrity": "sha512-wXv36yo+mfWllweN0Fq7sUs7PUiNopn7I0JpLTe3hGu6ZMR4CV7LqK1llhB18pndwpKoafQKb1et2DCJAOW20Q==", "dev": true, "requires": { "tslib": "^2.0.1" @@ -2392,6 +2369,15 @@ "tslib": "^2.0.1" }, "dependencies": { + "@formatjs/ecma402-abstract": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.4.0.tgz", + "integrity": "sha512-Mv027hcLFjE45K8UJ8PjRpdDGfR0aManEFj1KzoN8zXNveHGEygpZGfFf/FTTMl+QEVSrPAUlyxaCApvmv47AQ==", + "dev": true, + "requires": { + "tslib": "^2.0.1" + } + }, "tslib": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", @@ -2401,23 +2387,23 @@ } }, "@formatjs/ts-transformer": { - "version": "2.12.7", - "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-2.12.7.tgz", - "integrity": "sha512-KBG8wXspLd2P6Tx5mOvOXZqftUir/oOJIJR24rlItomANIJNzzLb47TPMTUH7ubB+1U4mHFavH04Iu39seTMWg==", + "version": "2.12.8", + "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-2.12.8.tgz", + "integrity": "sha512-gu1Nj1tNXM1yO5PKQtaT+/bedzbQGQrj+u2hrTeZN3Mto1+ofAEdF3/cB131ba9rKTQiG3eCoxByWNuQkvTxFA==", "dev": true, "requires": { - "intl-messageformat-parser": "6.0.16", + "intl-messageformat-parser": "6.0.17", "tslib": "^2.0.1", "typescript": "^4.0" }, "dependencies": { "intl-messageformat-parser": { - "version": "6.0.16", - "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-6.0.16.tgz", - "integrity": "sha512-Qy3Zz0vF4fhMVuW4BDqUr55LsOl9enM03wuwbP4Yg7v29rYNpf7Z76Whstu6uDLDJokrjbpgDvRcjSDTAhxKJw==", + "version": "6.0.17", + "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-6.0.17.tgz", + "integrity": "sha512-YLzTGKk+tXm0tuEuaATJjVl4C9HNjwC4VslrWQI9vQez1z7czbdmbNQD4ftXiAMLy/Pla+UxyH4jZt9UzI8Y4w==", "dev": true, "requires": { - "@formatjs/ecma402-abstract": "1.4.0", + "@formatjs/ecma402-abstract": "1.5.0", "tslib": "^2.0.1" } }, @@ -3220,9 +3206,9 @@ } }, "@popperjs/core": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.5.3.tgz", - "integrity": "sha512-RFwCobxsvZ6j7twS7dHIZQZituMIDJJNHS/qY6iuthVebxS3zhRY+jaC2roEKiAYaVuTcGmX6Luc6YBcf6zJVg==" + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.5.4.tgz", + "integrity": "sha512-ZpKr+WTb8zsajqgDkvCEWgp6d5eJT6Q63Ng2neTbzBO76Lbe91vX/iVIW9dikq+Fs3yEo+ls4cxeXABD2LtcbQ==" }, "@reduxjs/toolkit": { "version": "1.3.6", @@ -3359,9 +3345,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.12.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", - "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz", + "integrity": "sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -3384,19 +3370,19 @@ }, "dependencies": { "@babel/core": { - "version": "7.12.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz", - "integrity": "sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.7.tgz", + "integrity": "sha512-tRKx9B53kJe8NCGGIxEQb2Bkr0riUIEuN7Sc1fxhs5H8lKlCWUvQCSNMVIB0Meva7hcbCRJ76de15KoLltdoqw==", "dev": true, "requires": { "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.12.1", + "@babel/generator": "^7.12.5", "@babel/helper-module-transforms": "^7.12.1", - "@babel/helpers": "^7.12.1", - "@babel/parser": "^7.12.3", - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.12.1", - "@babel/types": "^7.12.1", + "@babel/helpers": "^7.12.5", + "@babel/parser": "^7.12.7", + "@babel/template": "^7.12.7", + "@babel/traverse": "^7.12.7", + "@babel/types": "^7.12.7", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -3419,12 +3405,12 @@ } }, "@babel/helper-member-expression-to-functions": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz", - "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz", + "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==", "dev": true, "requires": { - "@babel/types": "^7.12.1" + "@babel/types": "^7.12.7" } }, "@babel/helper-module-imports": { @@ -3486,32 +3472,43 @@ } }, "@babel/parser": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz", - "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz", + "integrity": "sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==", "dev": true }, + "@babel/template": { + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz", + "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/parser": "^7.12.7", + "@babel/types": "^7.12.7" + } + }, "@babel/traverse": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz", - "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.7.tgz", + "integrity": "sha512-nMWaqsQEeSvMNypswUDzjqQ+0rR6pqCtoQpsqGJC4/Khm9cISwPTSpai57F6/jDaOoEGz8yE/WxcO3PV6tKSmQ==", "dev": true, "requires": { "@babel/code-frame": "^7.10.4", "@babel/generator": "^7.12.5", "@babel/helper-function-name": "^7.10.4", "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.12.5", - "@babel/types": "^7.12.5", + "@babel/parser": "^7.12.7", + "@babel/types": "^7.12.7", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.19" } }, "@babel/types": { - "version": "7.12.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", - "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz", + "integrity": "sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -3520,9 +3517,9 @@ } }, "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -3922,9 +3919,9 @@ } }, "@types/classnames": { - "version": "2.2.10", - "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.10.tgz", - "integrity": "sha512-1UzDldn9GfYYEsWWnn/P4wkTlkZDH7lDb0wBMGbtIQc9zXEQq7FlKBdZUn6OBqD8sKZZ2RQO2mAjGpXiDGoRmQ==" + "version": "2.2.11", + "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.11.tgz", + "integrity": "sha512-2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw==" }, "@types/color-name": { "version": "1.1.1", @@ -4173,9 +4170,9 @@ "dev": true }, "@types/react": { - "version": "16.9.53", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.53.tgz", - "integrity": "sha512-4nW60Sd4L7+WMXH1D6jCdVftuW7j4Za6zdp6tJ33Rqv0nk1ZAmQKML9ZLD4H0dehA3FZxXR/GM8gXplf82oNGw==", + "version": "16.14.2", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.2.tgz", + "integrity": "sha512-BzzcAlyDxXl2nANlabtT4thtvbbnhee8hMmH/CcJrISDBVcJS1iOsP1f0OAgSdGE0MsY9tqcrb9YoZcOFv9dbQ==", "requires": { "@types/prop-types": "*", "csstype": "^3.0.2" @@ -4881,13 +4878,54 @@ } }, "array.prototype.flat": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz", - "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz", + "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==", "dev": true, "requires": { + "call-bind": "^1.0.0", "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" + "es-abstract": "^1.18.0-next.1" + }, + "dependencies": { + "es-abstract": { + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + }, + "is-callable": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", + "dev": true + }, + "object.assign": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + } + } } }, "arrify": { @@ -5038,6 +5076,15 @@ "is-buffer": "^2.0.2" } }, + "axios-cache-adapter": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/axios-cache-adapter/-/axios-cache-adapter-2.5.0.tgz", + "integrity": "sha512-YcMPdMoqmSLoZx7A5YD/PdYGuX6/Y9M2tHBhaIXvXrPeGgNnbW7nb3+uArWlT53WGHLfclnu2voMmS7jGXVg6A==", + "requires": { + "cache-control-esm": "1.0.0", + "lodash": "^4.17.11" + } + }, "axios-mock-adapter": { "version": "1.18.2", "resolved": "https://registry.npmjs.org/axios-mock-adapter/-/axios-mock-adapter-1.18.2.tgz", @@ -5312,6 +5359,7 @@ "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz", "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=", + "dev": true, "requires": { "babel-runtime": "^6.26.0", "core-js": "^2.5.0", @@ -5321,12 +5369,14 @@ "core-js": { "version": "2.6.11", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", - "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" + "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==", + "dev": true }, "regenerator-runtime": { "version": "0.10.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz", - "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=" + "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=", + "dev": true } } }, @@ -6183,6 +6233,11 @@ "unset-value": "^1.0.0" } }, + "cache-control-esm": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cache-control-esm/-/cache-control-esm-1.0.0.tgz", + "integrity": "sha512-Fa3UV4+eIk4EOih8FTV6EEsVKO0W5XWtNs6FC3InTfVz+EjurjPfDXY5wZDo/lxjDxg5RjNcurLyxEJBcEUx9g==" + }, "cacheable-request": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz", @@ -6260,7 +6315,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz", "integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==", - "dev": true, "requires": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.0" @@ -6353,9 +6407,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001158", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001158.tgz", - "integrity": "sha512-s5loVYY+yKpuVA3HyW8BarzrtJvwHReuzugQXlv1iR3LKSReoFXRm86mT6hT7PEF5RxW+XQZg+6nYjlywYzQ+g==", + "version": "1.0.30001159", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz", + "integrity": "sha512-w9Ph56jOsS8RL20K9cLND3u/+5WASWdhC/PPrf+V3/HsM3uHOavWOR1Xzakbv4Puo/srmPHudkmCRWM7Aq+/UA==", "dev": true }, "caporal": { @@ -7496,19 +7550,19 @@ }, "dependencies": { "css-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.1.tgz", - "integrity": "sha512-WroX+2MvsYcRGP8QA0p+rxzOniT/zpAoQ/DTKDSJzh5T3IQKUkFHeIIfgIapm2uaP178GWY3Mime1qbk8GO/tA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.1.tgz", + "integrity": "sha512-NVN42M2fjszcUNpDbdkvutgQSlFYsr1z7kqeuCagHnNLBfYor6uP1WL1KrkmdYZ5Y1vTBCIOI/C/+8T98fJ71w==", "dev": true, "requires": { - "mdn-data": "2.0.12", + "mdn-data": "2.0.14", "source-map": "^0.6.1" } }, "mdn-data": { - "version": "2.0.12", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.12.tgz", - "integrity": "sha512-ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", + "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", "dev": true } } @@ -7537,9 +7591,9 @@ } }, "csstype": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.2.tgz", - "integrity": "sha512-ofovWglpqoqbfLNOTBNZLSbMuGrblAf1efvvArGKOZMBrIoJeu5UsAipQolkijtyQx5MtAzT/J9IHj/CEY1mJw==" + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.5.tgz", + "integrity": "sha512-uVDi8LpBUKQj6sdxNaTetL6FpeCqTjOvAQuQUa/qAqq8oOd4ivkbhgnqayl0dnPal8Tb/yB1tF+gOvCBiicaiQ==" }, "currently-unhandled": { "version": "0.4.1", @@ -8088,9 +8142,9 @@ "dev": true }, "domelementtype": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz", - "integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz", + "integrity": "sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==" }, "domexception": { "version": "2.0.1", @@ -8118,13 +8172,23 @@ } }, "domutils": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.4.2.tgz", - "integrity": "sha512-NKbgaM8ZJOecTZsIzW5gSuplsX2IWW2mIK7xVr8hTQF2v1CJWTmLZ1HOCh5sH+IzVPAGE5IucooOkvwBRAdowA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.4.3.tgz", + "integrity": "sha512-MDMfEjgtzHvRX7i21XQfkk/vfZbLOe0VJk8dDETkTTo3BTeH3NXz3Xvs94UQ+GzTw/GjRYKsfVKIIOheYX63fw==", "requires": { "dom-serializer": "^1.0.1", "domelementtype": "^2.0.1", - "domhandler": "^3.3.0" + "domhandler": "^4.0.0" + }, + "dependencies": { + "domhandler": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz", + "integrity": "sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==", + "requires": { + "domelementtype": "^2.1.0" + } + } } }, "dot-case": { @@ -8271,9 +8335,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.598", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.598.tgz", - "integrity": "sha512-G5Ztk23/ubLYVPxPXnB1uu105uzIPd4xB/D8ld8x1GaSC9+vU9NZL16nYZya8H77/7CCKKN7dArzJL3pBs8N7A==", + "version": "1.3.603", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.603.tgz", + "integrity": "sha512-J8OHxOeJkoSLgBXfV9BHgKccgfLMHh+CoeRo6wJsi6m0k3otaxS/5vrHpMNSEYY4MISwewqanPOuhAtuE8riQQ==", "dev": true }, "elliptic": { @@ -8546,9 +8610,9 @@ }, "dependencies": { "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -9730,9 +9794,12 @@ } }, "focus-lock": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-0.7.0.tgz", - "integrity": "sha512-LI7v2mH02R55SekHYdv9pRHR9RajVNyIJ2N5IEkWbg7FT5ZmJ9Hw4mWxHeEUcd+dJo0QmzztHvDvWcc7prVFsw==" + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-0.8.1.tgz", + "integrity": "sha512-/LFZOIo82WDsyyv7h7oc0MJF9ACOvDRdx9rWPZ2pgMfNWu/z8hQDBtOchuB/0BVLmuFOZjV02YwUVzNsWx/EzA==", + "requires": { + "tslib": "^1.9.3" + } }, "follow-redirects": { "version": "1.5.10", @@ -9887,13 +9954,51 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "function.prototype.name": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.2.tgz", - "integrity": "sha512-C8A+LlHBJjB2AdcRPorc5JvJ5VUoWlXdEHLOJdCI7kjHEtGTpHQUiqMvCIKUwIsGwZX2jZJy761AXsn356bJQg==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.3.tgz", + "integrity": "sha512-H51qkbNSp8mtkJt+nyW1gyStBiKZxfRqySNUR99ylq6BPXHKI4SEvIlTKp4odLfjRKJV04DFWMU3G/YRlQOsag==", "requires": { + "call-bind": "^1.0.0", "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "functions-have-names": "^1.2.0" + "es-abstract": "^1.18.0-next.1", + "functions-have-names": "^1.2.1" + }, + "dependencies": { + "es-abstract": { + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + }, + "is-callable": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==" + }, + "object.assign": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + } + } } }, "functional-red-black-tree": { @@ -9936,7 +10041,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz", "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==", - "dev": true, "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -11035,6 +11139,11 @@ "is-cwebp-readable": "^2.0.1" } }, + "immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=" + }, "immer": { "version": "6.0.9", "resolved": "https://registry.npmjs.org/immer/-/immer-6.0.9.tgz", @@ -11602,8 +11711,7 @@ "is-negative-zero": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", - "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=", - "dev": true + "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=" }, "is-number": { "version": "3.0.0", @@ -11894,9 +12002,9 @@ }, "dependencies": { "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -14862,6 +14970,14 @@ "type-check": "~0.3.2" } }, + "lie": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", + "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=", + "requires": { + "immediate": "~3.0.5" + } + }, "lines-and-columns": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", @@ -14914,6 +15030,22 @@ "json5": "^2.1.2" } }, + "localforage": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.9.0.tgz", + "integrity": "sha512-rR1oyNrKulpe+VM9cYmcFn6tsHuokyVHFaCM3+osEmxaHTbEk8oQu6eGDfS6DQLWi/N67XRmB8ECG37OES368g==", + "requires": { + "lie": "3.1.1" + } + }, + "localforage-memoryStorageDriver": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/localforage-memoryStorageDriver/-/localforage-memoryStorageDriver-0.9.2.tgz", + "integrity": "sha1-Lg9/8qyw6f9egsUsni6z1juZjTA=", + "requires": { + "localforage": ">=1.4.0" + } + }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -16310,9 +16442,9 @@ "optional": true }, "p-each-series": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz", - "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz", + "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==", "dev": true }, "p-event": { @@ -16796,9 +16928,9 @@ }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { "ms": "^2.1.1" @@ -17811,19 +17943,6 @@ "react-transition-group": "^4.4.1", "uncontrollable": "^7.0.0", "warning": "^4.0.3" - }, - "dependencies": { - "react-transition-group": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz", - "integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==", - "requires": { - "@babel/runtime": "^7.5.5", - "dom-helpers": "^5.0.1", - "loose-envify": "^1.4.0", - "prop-types": "^15.6.2" - } - } } }, "react-break": { @@ -18175,12 +18294,12 @@ "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" }, "react-focus-lock": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-2.4.1.tgz", - "integrity": "sha512-c5ZP56KSpj9EAxzScTqQO7bQQNPltf/W1ZEBDqNDOV1XOIwvAyHX0O7db9ekiAtxyKgnqZjQlLppVg94fUeL9w==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-2.5.0.tgz", + "integrity": "sha512-XLxj6uTXgz0US8TmqNU2jMfnXwZG0mH2r/afQqvPEaX6nyEll5LHVcEXk2XDUQ34RVeLPkO/xK5x6c/qiuSq/A==", "requires": { "@babel/runtime": "^7.0.0", - "focus-lock": "^0.7.0", + "focus-lock": "^0.8.1", "prop-types": "^15.6.2", "react-clientside-effect": "^1.2.2", "use-callback-ref": "^1.2.1", @@ -18188,9 +18307,9 @@ } }, "react-focus-on": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/react-focus-on/-/react-focus-on-3.5.0.tgz", - "integrity": "sha512-RqGAHOxhRAaMSVHIN5IpY7YL6AJkD/DMa/+iPDV7aB6XWRQfg3v2q35egIZgMWP2xhXaRVai3B80dpVWyj4Rcw==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/react-focus-on/-/react-focus-on-3.5.1.tgz", + "integrity": "sha512-6iE56nYNwVU6Pke362TjqRLz/G7DBGnEugkxhPAhpXEZW5og3vhc9qDPlyiHgxoiY9kYTWjdAEFz4nJgSluANg==", "requires": { "aria-hidden": "^1.1.1", "react-focus-lock": "^2.3.1", @@ -18234,18 +18353,28 @@ "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, "react-overlays": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-4.1.0.tgz", - "integrity": "sha512-vdRpnKe0ckWOOD9uWdqykLUPHLPndIiUV7XfEKsi5008xiyHCfL8bxsx4LbMrfnxW1LzRthLyfy50XYRFNQqqw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-4.1.1.tgz", + "integrity": "sha512-WtJifh081e6M24KnvTQoNjQEpz7HoLxqt8TwZM7LOYIkYJ8i/Ly1Xi7RVte87ZVnmqQ4PFaFiNHZhSINPSpdBQ==", "requires": { - "@babel/runtime": "^7.4.5", - "@popperjs/core": "^2.0.0", - "@restart/hooks": "^0.3.12", + "@babel/runtime": "^7.12.1", + "@popperjs/core": "^2.5.3", + "@restart/hooks": "^0.3.25", "@types/warning": "^3.0.0", - "dom-helpers": "^5.1.0", + "dom-helpers": "^5.2.0", "prop-types": "^15.7.2", "uncontrollable": "^7.0.0", "warning": "^4.0.3" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz", + "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } } }, "react-proptype-conditional-require": { @@ -18276,9 +18405,9 @@ } }, "react-remove-scroll": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.4.0.tgz", - "integrity": "sha512-BZIO3GaEs0Or1OhA5C//n1ibUP1HdjJmqUVUsOCMxwoIpaCocbB9TFKwHOkBa/nyYy3slirqXeiPYGwdSDiseA==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.4.1.tgz", + "integrity": "sha512-K7XZySEzOHMTq7dDwcHsZA6Y7/1uX5RsWhRXVYv8rdh+y9Qz2nMwl9RX/Mwnj/j7JstCGmxyfyC0zbVGXYh3mA==", "requires": { "react-remove-scroll-bar": "^2.1.0", "react-style-singleton": "^2.1.0", @@ -18288,23 +18417,22 @@ } }, "react-remove-scroll-bar": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.1.0.tgz", - "integrity": "sha512-5X5Y5YIPjIPrAoMJxf6Pfa7RLNGCgwZ95TdnVPgPuMftRfO8DaC7F4KP1b5eiO8hHbe7u+wZNDbYN5WUTpv7+g==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.1.1.tgz", + "integrity": "sha512-IZbfQPSozIr8ylHE9MFcQeb2TTzj4abfE7OBXjmtUeXQ5h6ColGKDNo5h7OmzrJRilAx3YIKBf3jb0yrb31BJQ==", "requires": { "react-style-singleton": "^2.1.0", "tslib": "^1.0.0" } }, "react-responsive": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/react-responsive/-/react-responsive-8.0.3.tgz", - "integrity": "sha512-F9VXyLao7O8XHXbLjQbIr4+mC6Zr0RDTwNjd7ixTmYEAyKyNanBkLkFchNaMZgszoSK6PgSs/3m/QDWw33/gpg==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/react-responsive/-/react-responsive-6.1.2.tgz", + "integrity": "sha512-AXentVC/kN3KED9zhzJv2pu4vZ0i6cSHdTtbCScVV1MT6F5KXaG2qs5D7WLmhdaOvmiMX8UfmS4ZSO+WPwDt4g==", "requires": { "hyphenate-style-name": "^1.0.0", "matchmediaquery": "^0.3.0", - "prop-types": "^15.6.1", - "shallow-equal": "^1.1.0" + "prop-types": "^15.6.1" } }, "react-router": { @@ -18353,9 +18481,9 @@ "integrity": "sha512-IgmcegOSi5SNX+2Snh1vqmF0Vg/CbkycU9XZbOHJlZ6kMzTmi3yc254oB1WCkgA7OQtIAoLmcSFuHTc/tlcqXg==" }, "react-style-singleton": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.1.0.tgz", - "integrity": "sha512-DH4ED+YABC1dhvSDYGGreAHmfuTXj6+ezT3CmHoqIEfxNgEYfIMoOtmbRp42JsUst3IPqBTDL+8r4TF7EWhIHw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.1.1.tgz", + "integrity": "sha512-jNRp07Jza6CBqdRKNgGhT3u9umWvils1xsuMOjZlghBDH2MU0PL2WZor4PGYjXpnRCa9DQSlHMs/xnABWOwYbA==", "requires": { "get-nonce": "^1.0.0", "invariant": "^2.2.4", @@ -18363,9 +18491,9 @@ } }, "react-transition-group": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.3.0.tgz", - "integrity": "sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz", + "integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==", "requires": { "@babel/runtime": "^7.5.5", "dom-helpers": "^5.0.1", @@ -19590,11 +19718,6 @@ "kind-of": "^6.0.2" } }, - "shallow-equal": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz", - "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA==" - }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", @@ -19900,9 +20023,9 @@ }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { "ms": "^2.1.1" @@ -20063,9 +20186,9 @@ }, "dependencies": { "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -20094,9 +20217,9 @@ }, "dependencies": { "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -20385,17 +20508,58 @@ } }, "string.prototype.matchall": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz", - "integrity": "sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.3.tgz", + "integrity": "sha512-OBxYDA2ifZQ2e13cP82dWFMaCV9CGF8GzmN4fljBVw5O5wep0lu4gacm1OL6MjROoUnB8VbkWRThqkV2YFLNxw==", "dev": true, "requires": { + "call-bind": "^1.0.0", "define-properties": "^1.1.3", - "es-abstract": "^1.17.0", + "es-abstract": "^1.18.0-next.1", "has-symbols": "^1.0.1", "internal-slot": "^1.0.2", "regexp.prototype.flags": "^1.3.0", - "side-channel": "^1.0.2" + "side-channel": "^1.0.3" + }, + "dependencies": { + "es-abstract": { + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + }, + "is-callable": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", + "dev": true + }, + "object.assign": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + } + } } }, "string.prototype.trimend": { @@ -21309,9 +21473,9 @@ } }, "typescript": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz", - "integrity": "sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.2.tgz", + "integrity": "sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==", "dev": true }, "unbzip2-stream": { @@ -22286,9 +22450,9 @@ } }, "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" diff --git a/package.json b/package.json index c7e2b099..1c0bc639 100644 --- a/package.json +++ b/package.json @@ -34,11 +34,11 @@ "url": "https://github.com/edx/frontend-app-learning/issues" }, "dependencies": { - "@edx/frontend-component-footer": "10.0.11", - "@edx/frontend-component-header": "2.0.6", + "@edx/brand": "npm:@edx/brand-openedx@1.1.0", + "@edx/frontend-component-footer": "^10.1.0", "@edx/frontend-enterprise": "4.2.3", - "@edx/frontend-platform": "1.5.4", - "@edx/paragon": "12.0.5", + "@edx/frontend-platform": "1.8.0", + "@edx/paragon": "^12.3.1", "@fortawesome/fontawesome-svg-core": "1.2.32", "@fortawesome/free-brands-svg-icons": "5.13.1", "@fortawesome/free-regular-svg-icons": "5.13.1", @@ -59,10 +59,10 @@ "redux": "4.0.5", "regenerator-runtime": "0.13.7", "reselect": "4.0.0", - "truncate-html": "^1.0.3" + "truncate-html": "1.0.3" }, "devDependencies": { - "@edx/frontend-build": "5.4.0", + "@edx/frontend-build": "5.5.1", "@testing-library/dom": "7.16.3", "@testing-library/jest-dom": "5.10.1", "@testing-library/react": "10.3.0", @@ -73,7 +73,7 @@ "glob": "7.1.6", "husky": "3.1.0", "jest": "24.9.0", - "jest-chain": "^1.1.5", + "jest-chain": "1.1.5", "reactifex": "1.1.1", "rosie": "2.0.1" } diff --git a/public/index.html b/public/index.html index ed8b3bea..25011915 100644 --- a/public/index.html +++ b/public/index.html @@ -4,7 +4,7 @@ Course | <%= process.env.SITE_NAME %> - + <% if (htmlWebpackPlugin.options.OPTIMIZELY_PROJECT_ID) { %> <% } %> diff --git a/src/assets/favicon.ico b/src/assets/favicon.ico deleted file mode 100644 index 13801059f168105d6fc9f9a4bf611aa0ed2b40a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34894 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 ); diff --git a/src/course-header/assets/logo.svg b/src/course-header/assets/logo.svg deleted file mode 100644 index 1fbac450..00000000 --- a/src/course-header/assets/logo.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - logo - Created with Sketch. - - \ No newline at end of file diff --git a/src/courseware/course/course-exit/CourseCelebration.jsx b/src/courseware/course/course-exit/CourseCelebration.jsx index 953716f4..1f80ce83 100644 --- a/src/courseware/course/course-exit/CourseCelebration.jsx +++ b/src/courseware/course/course-exit/CourseCelebration.jsx @@ -1,4 +1,6 @@ import React, { useEffect } from 'react'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import { faLinkedinIn } from '@fortawesome/free-brands-svg-icons'; import { FormattedDate, FormattedMessage, injectIntl, intlShape, @@ -6,7 +8,6 @@ import { import { layoutGenerator } from 'react-break'; import { Helmet } from 'react-helmet'; import { useDispatch, useSelector } from 'react-redux'; -import { LinkedinIcon } from 'react-share'; import { Alert, Button, Hyperlink } from '@edx/paragon'; import { getConfig } from '@edx/frontend-platform'; import { getAuthenticatedUser } from '@edx/frontend-platform/auth'; @@ -24,7 +25,7 @@ import UpgradeFootnote from './UpgradeFootnote'; import SocialIcons from '../../social-share/SocialIcons'; import { logClick, logVisit } from './utils'; -const LINKEDIN_BLUE = '#007fb1'; +const LINKEDIN_BLUE = '#2867B2'; function CourseCelebration({ intl }) { const layout = layoutGenerator({ @@ -85,7 +86,6 @@ function CourseCelebration({ intl }) { let buttonLocation; let buttonText; - let buttonBackground = 'bg-white'; let buttonVariant = 'outline-primary'; let buttonEvent = null; let certificateImage = certificate; @@ -204,7 +204,6 @@ function CourseCelebration({ intl }) { buttonText = intl.formatMessage(messages.upgradeButton); buttonEvent = 'upgrade'; buttonLocation = verifiedMode.upgradeUrl; - buttonBackground = ''; buttonVariant = 'primary'; certificateImage = certificateLocked; visitEvent = 'celebration_upgrade'; @@ -266,7 +265,6 @@ function CourseCelebration({ intl }) { {/* The requesting status needs a different button because it does a POST instead of a GET */} {certStatus === 'requesting' && ( )} {buttonLocation && (