diff --git a/package-lock.json b/package-lock.json index 2db375f3c..57f768ba9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,6 @@ "license": "AGPL-3.0", "dependencies": { "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2", - "@edx/frontend-component-footer": "13.1.0", "@edx/frontend-component-header": "5.3.1", "@edx/frontend-platform": "8.0.1", "@edx/openedx-atlas": "^0.6.0", @@ -20,6 +19,7 @@ "@fortawesome/free-solid-svg-icons": "5.15.4", "@fortawesome/react-fontawesome": "0.2.0", "@openedx/frontend-plugin-framework": "^1.1.2", + "@openedx/frontend-slot-footer": "^1.0.0", "@openedx/paragon": "22.0.0", "@tensorflow-models/blazeface": "0.0.7", "@tensorflow/tfjs-converter": "3.21.0", @@ -2107,9 +2107,10 @@ } }, "node_modules/@edx/frontend-component-footer": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/@edx/frontend-component-footer/-/frontend-component-footer-13.1.0.tgz", - "integrity": "sha512-Rtv8dfQmL75El8kF8dG9nYF1Cqj2AbWPLVLE4b0XTvipfx2RMeDKpgAO5XLAzTt0h+5fmiMCGhVEv3Y70Xu5pQ==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/@edx/frontend-component-footer/-/frontend-component-footer-14.0.0.tgz", + "integrity": "sha512-3Riz6ippBnPz1oq6gZgFBx27bJkNL+rwwKrv0uCuHV/5MscS1aYeKx1ZAMuUsxkKcGX6uhyU6PwM6agvnhKfNQ==", + "peer": true, "dependencies": { "@fortawesome/fontawesome-svg-core": "6.5.2", "@fortawesome/free-brands-svg-icons": "6.5.2", @@ -2133,6 +2134,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.2.tgz", "integrity": "sha512-gBxPg3aVO6J0kpfHNILc+NMhXnqHumFxOmjYCFfOiLZfwhnnfhtsdA2hfJlDnj+8PjAs6kKQPenOTKj3Rf7zHw==", "hasInstallScript": true, + "peer": true, "engines": { "node": ">=6" } @@ -2142,6 +2144,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.2.tgz", "integrity": "sha512-5CdaCBGl8Rh9ohNdxeeTMxIj8oc3KNBgIeLMvJosBMdslK/UnEB8rzyDRrbKdL1kDweqBPo4GT9wvnakHWucZw==", "hasInstallScript": true, + "peer": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.5.2" }, @@ -2154,6 +2157,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.5.2.tgz", "integrity": "sha512-zi5FNYdmKLnEc0jc0uuHH17kz/hfYTg4Uei0wMGzcoCL/4d3WM3u1VMc0iGGa31HuhV5i7ZK8ZlTCQrHqRHSGQ==", "hasInstallScript": true, + "peer": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.5.2" }, @@ -2166,6 +2170,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.5.2.tgz", "integrity": "sha512-iabw/f5f8Uy2nTRtJ13XZTS1O5+t+anvlamJ3zJGLEVE2pKsAWhPv2lq01uQlfgCX7VaveT3EVs515cCN9jRbw==", "hasInstallScript": true, + "peer": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.5.2" }, @@ -2178,6 +2183,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.5.2.tgz", "integrity": "sha512-QWFZYXFE7O1Gr1dTIp+D6UcFUF0qElOnZptpi7PBUMylJh+vFmIedVe1Ir6RM1t2tEQLLSV1k7bR4o92M+uqlw==", "hasInstallScript": true, + "peer": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.5.2" }, @@ -3655,6 +3661,20 @@ "url": "https://opencollective.com/core-js" } }, + "node_modules/@openedx/frontend-slot-footer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@openedx/frontend-slot-footer/-/frontend-slot-footer-1.0.0.tgz", + "integrity": "sha512-9fPyT/vuvqtbkgZ0c9YWp3rcweCA8KLY+wDZy6h5Z0D8P+jNr9X8cXR529RzVkLJZfsMFKmQa7LzpdIwVJ/tyw==", + "dependencies": { + "@openedx/frontend-plugin-framework": "^1.1.2" + }, + "peerDependencies": { + "@edx/frontend-component-footer": "^14.0.0", + "core-js": "3.37.0", + "react": "^17.0.0", + "regenerator-runtime": "0.14.1" + } + }, "node_modules/@openedx/paragon": { "version": "22.0.0", "resolved": "https://registry.npmjs.org/@openedx/paragon/-/paragon-22.0.0.tgz", diff --git a/package.json b/package.json index f7c211d45..096116471 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,6 @@ ], "dependencies": { "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2", - "@edx/frontend-component-footer": "13.1.0", "@edx/frontend-component-header": "5.3.1", "@edx/frontend-platform": "8.0.1", "@edx/openedx-atlas": "^0.6.0", @@ -38,6 +37,7 @@ "@fortawesome/free-solid-svg-icons": "5.15.4", "@fortawesome/react-fontawesome": "0.2.0", "@openedx/frontend-plugin-framework": "^1.1.2", + "@openedx/frontend-slot-footer": "^1.0.0", "@openedx/paragon": "22.0.0", "@tensorflow-models/blazeface": "0.0.7", "@tensorflow/tfjs-converter": "3.21.0", diff --git a/src/index.jsx b/src/index.jsx index a2a41c27d..385d7b534 100755 --- a/src/index.jsx +++ b/src/index.jsx @@ -11,8 +11,7 @@ import ReactDOM from 'react-dom'; import { Route, Routes, Outlet } from 'react-router-dom'; import Header from '@edx/frontend-component-header'; -// Reverting this since footer-edx overrite doesn't support FooterPlugin -import Footer from '@edx/frontend-component-footer'; +import FooterSlot from '@openedx/frontend-slot-footer'; import configureStore from './data/configureStore'; import AccountSettingsPage, { NotFoundPage } from './account-settings'; @@ -35,7 +34,7 @@ subscribe(APP_READY, () => {
-