From f90abeb5b7030910664854ad58cb53160b70397f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brayan=20Cer=C3=B3n?= <86393372+bra-i-am@users.noreply.github.com> Date: Tue, 28 May 2024 07:31:19 -0500 Subject: [PATCH 1/5] perf: add css-variables support to redwood (#6) --- package-lock.json | 2 ++ package.json | 1 + 2 files changed, 3 insertions(+) diff --git a/package-lock.json b/package-lock.json index 1551ea1ab..18aca2bfd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,6 +19,7 @@ "@fortawesome/free-regular-svg-icons": "5.15.4", "@fortawesome/free-solid-svg-icons": "5.15.4", "@fortawesome/react-fontawesome": "0.2.0", + "@openedx/frontend-plugin-framework": "^1.1.2", "@openedx/paragon": "23.0.0-alpha.1", "@tensorflow-models/blazeface": "0.0.7", "@tensorflow/tfjs-converter": "3.21.0", @@ -2132,6 +2133,7 @@ }, "peerDependencies": { "@edx/frontend-platform": "^7.0.0 || ^7.1.2-alpha.1", + "@openedx/frontend-plugin-framework": "^1.1.2", "@openedx/paragon": ">= 21.11.3 < 23.0.0 || ^23.0.0-alpha.1", "prop-types": "^15.5.10", "react": "^16.9.0 || ^17.0.0", diff --git a/package.json b/package.json index 658cabbb0..b8f51148e 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "@fortawesome/free-regular-svg-icons": "5.15.4", "@fortawesome/free-solid-svg-icons": "5.15.4", "@fortawesome/react-fontawesome": "0.2.0", + "@openedx/frontend-plugin-framework": "^1.1.2", "@openedx/paragon": "23.0.0-alpha.1", "@tensorflow-models/blazeface": "0.0.7", "@tensorflow/tfjs-converter": "3.21.0", From 22e19300f60d495bc0fa2a3683ea26f248d11681 Mon Sep 17 00:00:00 2001 From: Brian Smith <112954497+brian-smith-tcril@users.noreply.github.com> Date: Wed, 15 May 2024 16:46:34 -0400 Subject: [PATCH 2/5] fix: import `FooterSlot` from `frontend-slot-footer` package (#1048) --- package-lock.json | 21 ++++++++++- package.json | 2 +- src/index.jsx | 4 +-- src/plugin-slots/FooterSlot/README.md | 50 +++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 src/plugin-slots/FooterSlot/README.md diff --git a/package-lock.json b/package-lock.json index 18aca2bfd..caef32149 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": "npm:@edunext/frontend-component-footer@13.0.4-alpha.1", "@edx/frontend-component-header": "npm:@edunext/frontend-component-header@5.0.2-alpha.1", "@edx/frontend-platform": "npm:@edunext/frontend-platform@7.1.2-alpha.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": "23.0.0-alpha.1", "@tensorflow-models/blazeface": "0.0.7", "@tensorflow/tfjs-converter": "3.21.0", @@ -2145,6 +2145,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.1.tgz", "integrity": "sha512-GkWzv+L6d2bI5f/Vk6ikJ9xtl7dfXtoRu3YGE6nq0p/FFqA1ebMOAWg3XgRyb0I6LYyYkiAo+3/KrwuBp8xG7A==", "hasInstallScript": true, + "peer": true, "engines": { "node": ">=6" } @@ -2154,6 +2155,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.1.tgz", "integrity": "sha512-MfRCYlQPXoLlpem+egxjfkEuP9UQswTrlCOsknus/NcMoblTH2g0jPrapbcIb04KGA7E2GZxbAccGZfWoYgsrQ==", "hasInstallScript": true, + "peer": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.5.1" }, @@ -2166,6 +2168,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.5.1.tgz", "integrity": "sha512-093l7DAkx0aEtBq66Sf19MgoZewv1zeY9/4C7vSKPO4qMwEsW/2VYTUTpBtLwfb9T2R73tXaRDPmE4UqLCYHfg==", "hasInstallScript": true, + "peer": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.5.1" }, @@ -2178,6 +2181,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.5.1.tgz", "integrity": "sha512-m6ShXn+wvqEU69wSP84coxLbNl7sGVZb+Ca+XZq6k30SzuP3X4TfPqtycgUh9ASwlNh5OfQCd8pDIWxl+O+LlQ==", "hasInstallScript": true, + "peer": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.5.1" }, @@ -2190,6 +2194,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.5.1.tgz", "integrity": "sha512-S1PPfU3mIJa59biTtXJz1oI0+KAXW6bkAb31XKhxdxtuXDiUIFsih4JR1v5BbxY7hVHsD1RKq+jRkVRaf773NQ==", "hasInstallScript": true, + "peer": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.5.1" }, @@ -5004,6 +5009,20 @@ "node": ">=6" } }, + "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": "23.0.0-alpha.1", "resolved": "https://registry.npmjs.org/@openedx/paragon/-/paragon-23.0.0-alpha.1.tgz", diff --git a/package.json b/package.json index b8f51148e..c48a50ba5 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ ], "dependencies": { "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2", - "@edx/frontend-component-footer": "npm:@edunext/frontend-component-footer@13.0.4-alpha.1", "@edx/frontend-component-header": "npm:@edunext/frontend-component-header@5.0.2-alpha.1", "@edx/frontend-platform": "npm:@edunext/frontend-platform@7.1.2-alpha.1", "@edx/openedx-atlas": "^0.6.0", @@ -39,6 +38,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": "23.0.0-alpha.1", "@tensorflow-models/blazeface": "0.0.7", "@tensorflow/tfjs-converter": "3.21.0", diff --git a/src/index.jsx b/src/index.jsx index 65f4bfd1f..19e23d8f7 100755 --- a/src/index.jsx +++ b/src/index.jsx @@ -11,7 +11,7 @@ import ReactDOM from 'react-dom'; import { Route, Routes, Outlet } from 'react-router-dom'; import Header from '@edx/frontend-component-header'; -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'; @@ -34,7 +34,7 @@ subscribe(APP_READY, () => {
-