fix: downgrade frontend-platform

build(deps): bump terser from 4.8.0 to 4.8.1

.eslintrc.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
 const { createConfig } = require('@edx/frontend-build');
 
 module.exports = createConfig('eslint');

.github/workflows/ci.yml

@@ -1,8 +1,8 @@
 name: Default CI
-on: 
+on:
   push:
     branches:
-    - 'master'
+    - master
   pull_request:
     branches:
     - '**'
@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [12, 14, 16]
+        node: [16]
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - name: Setup Nodejs
@@ -29,7 +29,9 @@ jobs:
       run: npm run lint
     - name: Test
       run: npm run test
+    - name: Build
+      run: npm run build
     - name: i18n_extract
       run: npm run i18n_extract
     - name: Coverage
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v3

.github/workflows/commitlint.yml

@@ -7,4 +7,4 @@ on:
 
 jobs:
   commitlint:
-    uses: edx/.github/.github/workflows/commitlint.yml@master
+    uses: openedx/.github/.github/workflows/commitlint.yml@master

.github/workflows/lockfileversion-check.yml

@@ -0,0 +1,13 @@
+#check package-lock file version
+
+name: Lockfile Version check
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+
+jobs:
+  version-check:
+    uses: openedx/.github/.github/workflows/lockfileversion-check.yml@master

.github/workflows/release.yml

@@ -2,36 +2,36 @@ name: Release CI
 on:
   push:
     branches:
-      - master
+    - master
 jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: 12
-      - name: Install dependencies
-        run: npm ci
-      - name: Validate package-lock.json changes
-        run: make validate-no-uncommitted-package-lock-changes
-      - name: Lint
-        run: npm run lint
-      - name: Test
-        run: npm run test
-      - name: i18n_extract
-        run: npm run i18n_extract
-      - name: Coverage
-        uses: codecov/codecov-action@v2
-      - name: Build
-        run: npm run build
-      - name: Release
-        env:
-          GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.SEMANTIC_RELEASE_NPM_TOKEN }}
-        run: npx semantic-release
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Setup Node.js
+      uses: actions/setup-node@v2
+      with:
+        node-version: 16
+    - name: Install dependencies
+      run: npm ci
+    - name: Validate package-lock.json changes
+      run: make validate-no-uncommitted-package-lock-changes
+    - name: Lint
+      run: npm run lint
+    - name: Test
+      run: npm run test
+    - name: i18n_extract
+      run: npm run i18n_extract
+    - name: Coverage
+      uses: codecov/codecov-action@v3
+    - name: Build
+      run: npm run build
+    - name: Release
+      env:
+        GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_GITHUB_TOKEN }}
+        NPM_TOKEN: ${{ secrets.SEMANTIC_RELEASE_NPM_TOKEN }}
+      run: npx semantic-release

Makefile

@@ -1,5 +1,5 @@
 transifex_resource = frontend-component-footer
-transifex_langs = "ar,fr,es_419,zh_CN"
+transifex_langs = "ar,fr,es_419,zh_CN,pt,it,de,uk,ru,hi,fr_CA"
 
 transifex_utils = ./node_modules/.bin/transifex-utils.js
 i18n = ./src/i18n

README.rst

@@ -14,7 +14,7 @@ A generic footer for Open edX micro-frontend applications.  It includes a logo a
 Requirements
 ************
 
-This component uses ``@edx/frontend-platform`` services such as i18n, analytics, configuration, and the ``AppContext`` React component, and expects that it has been loaded into a micro-frontend that has been properly initialized via ``@edx/frontend-platform``'s ``initialize`` function.  `Please visit the frontend template application to see an example. <https://github.com/edx/frontend-template-application/blob/3355bb3a96232390e9056f35b06ffa8f105ed7ca/src/index.jsx>`_
+This component uses ``@edx/frontend-platform`` services such as i18n, analytics, configuration, and the ``AppContext`` React component, and expects that it has been loaded into a micro-frontend that has been properly initialized via ``@edx/frontend-platform``'s ``initialize`` function.  `Please visit the frontend template application to see an example. <https://github.com/openedx/frontend-template-application/blob/3355bb3a96232390e9056f35b06ffa8f105ed7ca/src/index.jsx>`_
 
 Environment Variables
 =====================
@@ -68,8 +68,8 @@ Component Usage Example::
     ]}
   />
 
-* `An example of minimal component and messages usage. <https://github.com/edx/frontend-template-application/blob/3355bb3a96232390e9056f35b06ffa8f105ed7ca/src/index.jsx#L23>`_
-* `An example of SCSS file usage. <https://github.com/edx/frontend-template-application/blob/3cd5485bf387b8c479baf6b02bf59e3061dc3465/src/index.scss#L9>`_
+* `An example of minimal component and messages usage. <https://github.com/openedx/frontend-template-application/blob/3355bb3a96232390e9056f35b06ffa8f105ed7ca/src/index.jsx#L23>`_
+* `An example of SCSS file usage. <https://github.com/openedx/frontend-template-application/blob/3cd5485bf387b8c479baf6b02bf59e3061dc3465/src/index.scss#L9>`_
 
 ***********
 Development

package.json

@@ -24,42 +24,41 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/edx/frontend-component-footer.git"
+    "url": "git+https://github.com/openedx/frontend-component-footer.git"
   },
   "author": "edX",
   "license": "AGPL-3.0",
   "bugs": {
-    "url": "https://github.com/edx/frontend-component-footer/issues"
+    "url": "https://github.com/openedx/frontend-component-footer/issues"
   },
-  "homepage": "https://github.com/edx/frontend-component-footer#readme",
+  "homepage": "https://github.com/openedx/frontend-component-footer#readme",
   "devDependencies": {
     "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
-    "@edx/frontend-build": "9.1.4",
-    "@edx/frontend-platform": "^1.15.1",
-    "@edx/paragon": "^19.6.0",
-    "codecov": "3.8.3",
+    "@edx/frontend-build": "12.3.0",
+    "@edx/frontend-platform": "^2.6.2",
+    "@edx/paragon": "19.25.3",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.6",
     "husky": "7.0.4",
-    "prop-types": "15.7.2",
+    "prop-types": "15.8.1",
     "react": "16.14.0",
     "react-dom": "16.14.0",
     "react-redux": "7.2.8",
-    "react-router-dom": "5.3.0",
+    "react-router-dom": "5.3.3",
     "react-test-renderer": "16.14.0",
     "reactifex": "1.1.1",
-    "redux": "4.1.2",
-    "semantic-release": "^17.0.0"
+    "redux": "4.2.0",
+    "semantic-release": "19.0.3"
   },
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "1.2.36",
     "@fortawesome/free-brands-svg-icons": "5.15.4",
     "@fortawesome/free-regular-svg-icons": "5.15.4",
     "@fortawesome/free-solid-svg-icons": "5.15.4",
-    "@fortawesome/react-fontawesome": "0.1.18"
+    "@fortawesome/react-fontawesome": "0.2.0"
   },
   "peerDependencies": {
-    "@edx/frontend-platform": "^1.8.0",
+    "@edx/frontend-platform": "^2.0.0",
     "prop-types": "^15.5.10",
     "react": "^16.9.0",
     "react-dom": "^16.9.0"

renovate.json

@@ -22,6 +22,11 @@
         "pin"
       ],
       "automerge": true
+    },
+    {
+      "matchPackagePatterns": ["@edx"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "automerge": true
     }
   ],
   "timezone": "America/New_York"

src/components/Footer.jsx

@@ -23,14 +23,6 @@ class SiteFooter extends React.Component {
     this.externalLinkClickHandler = this.externalLinkClickHandler.bind(this);
   }
 
-  getLocalePrefix(locale) {
-    const twoLetterPrefix = locale.substring(0, 2).toLowerCase();
-    if (twoLetterPrefix === 'en') {
-      return '';
-    }
-    return `/${twoLetterPrefix}`;
-  }
-
   externalLinkClickHandler(event) {
     const label = event.currentTarget.getAttribute('href');
     const eventName = EVENT_NAMES.FOOTER_LINK;

src/components/Footer.test.jsx

@@ -1,4 +1,5 @@
-import React from 'react';
+/* eslint-disable react/prop-types */
+import React, { useMemo } from 'react';
 import renderer from 'react-test-renderer';
 import { mount } from 'enzyme';
 import { IntlProvider } from '@edx/frontend-platform/i18n';
@@ -6,71 +7,69 @@ import { AppContext } from '@edx/frontend-platform/react';
 
 import Footer from './Footer';
 
+const FooterWithContext = ({ locale = 'es' }) => {
+  const contextValue = useMemo(() => ({
+    authenticatedUser: null,
+    config: {
+      LOGO_TRADEMARK_URL: process.env.LOGO_TRADEMARK_URL,
+      LMS_BASE_URL: process.env.LMS_BASE_URL,
+    },
+  }), []);
+
+  return (
+    <IntlProvider locale={locale}>
+      <AppContext.Provider
+        value={contextValue}
+      >
+        <Footer />
+      </AppContext.Provider>
+    </IntlProvider>
+  );
+};
+
+const FooterWithLanguageSelector = ({ languageSelected = () => {} }) => {
+  const contextValue = useMemo(() => ({
+    authenticatedUser: null,
+    config: {
+      LOGO_TRADEMARK_URL: process.env.LOGO_TRADEMARK_URL,
+      LMS_BASE_URL: process.env.LMS_BASE_URL,
+    },
+  }), []);
+
+  return (
+    <IntlProvider locale="en">
+      <AppContext.Provider
+        value={contextValue}
+      >
+        <Footer
+          onLanguageSelected={languageSelected}
+          supportedLanguages={[
+            { label: 'English', value: 'en' },
+            { label: 'Español', value: 'es' },
+          ]}
+        />
+      </AppContext.Provider>
+    </IntlProvider>
+  );
+};
+
 describe('<Footer />', () => {
   describe('renders correctly', () => {
     it('renders without a language selector', () => {
       const tree = renderer
-        .create((
-          <IntlProvider locale="en">
-            <AppContext.Provider
-              value={{
-                authenticatedUser: null,
-                config: {
-                  LOGO_TRADEMARK_URL: process.env.LOGO_TRADEMARK_URL,
-                  LMS_BASE_URL: process.env.LMS_BASE_URL,
-                },
-              }}
-            >
-              <Footer />
-            </AppContext.Provider>
-          </IntlProvider>
-        ))
+        .create(<FooterWithContext locale="en" />)
         .toJSON();
       expect(tree).toMatchSnapshot();
     });
     it('renders without a language selector in es', () => {
       const tree = renderer
-        .create((
-          <IntlProvider locale="es">
-            <AppContext.Provider
-              value={{
-                authenticatedUser: null,
-                config: {
-                  LOGO_TRADEMARK_URL: process.env.LOGO_TRADEMARK_URL,
-                  LMS_BASE_URL: process.env.LMS_BASE_URL,
-                },
-              }}
-            >
-              <Footer />
-            </AppContext.Provider>
-          </IntlProvider>
-        ))
+        .create(<FooterWithContext locale="es" />)
         .toJSON();
       expect(tree).toMatchSnapshot();
     });
     it('renders with a language selector', () => {
       const tree = renderer
-        .create((
-          <IntlProvider locale="en">
-            <AppContext.Provider
-              value={{
-                authenticatedUser: null,
-                config: {
-                  LOGO_TRADEMARK_URL: process.env.LOGO_TRADEMARK_URL,
-                  LMS_BASE_URL: process.env.LMS_BASE_URL,
-                },
-              }}
-            >
-              <Footer
-                onLanguageSelected={() => {}}
-                supportedLanguages={[
-                  { label: 'English', value: 'en' },
-                  { label: 'Español', value: 'es' },
-                ]}
-              />
-            </AppContext.Provider>
-          </IntlProvider>
-        ))
+        .create(<FooterWithLanguageSelector />)
         .toJSON();
       expect(tree).toMatchSnapshot();
     });
@@ -79,27 +78,7 @@ describe('<Footer />', () => {
   describe('handles language switching', () => {
     it('calls onLanguageSelected prop when a language is changed', () => {
       const mockHandleLanguageSelected = jest.fn();
-      const wrapper = mount((
-        <IntlProvider locale="en">
-          <AppContext.Provider
-            value={{
-              authenticatedUser: null,
-              config: {
-                LOGO_TRADEMARK_URL: process.env.LOGO_TRADEMARK_URL,
-                LMS_BASE_URL: process.env.LMS_BASE_URL,
-              },
-            }}
-          >
-            <Footer
-              onLanguageSelected={mockHandleLanguageSelected}
-              supportedLanguages={[
-                { label: 'English', value: 'en' },
-                { label: 'Español', value: 'es' },
-              ]}
-            />
-          </AppContext.Provider>
-        </IntlProvider>
-      ));
+      const wrapper = mount(<FooterWithLanguageSelector languageSelected={mockHandleLanguageSelected} />);
 
       wrapper.find('form').simulate('submit', {
         target: {

src/components/__snapshots__/Footer.test.jsx.snap

@@ -37,9 +37,7 @@ exports[`<Footer /> renders correctly renders with a language selector 1`] = `
           className="d-inline-block m-0"
           htmlFor="site-footer-language-select"
         >
-          <span>
-            Choose Language
-          </span>
+          Choose Language
         </label>
         <select
           className="form-control-sm mx-2"
@@ -62,9 +60,7 @@ exports[`<Footer /> renders correctly renders with a language selector 1`] = `
           className="btn btn-outline-primary btn-sm"
           type="submit"
         >
-          <span>
-            Apply
-          </span>
+          Apply
         </button>
       </div>
     </form>

src/i18n/index.js

@@ -1,31 +1,27 @@
 import arMessages from './messages/ar.json';
-import caMessages from './messages/ca.json';
-// no need to import en messages-- they are in the defaultMessage field
-import es419Messages from './messages/es_419.json';
 import frMessages from './messages/fr.json';
+import es419Messages from './messages/es_419.json';
 import zhcnMessages from './messages/zh_CN.json';
-import heMessages from './messages/he.json';
-import idMessages from './messages/id.json';
-import kokrMessages from './messages/ko_kr.json';
-import plMessages from './messages/pl.json';
-import ptbrMessages from './messages/pt_br.json';
-import ruMessages from './messages/ru.json';
-import thMessages from './messages/th.json';
+import ptMessages from './messages/pt.json';
+import itMessages from './messages/it.json';
 import ukMessages from './messages/uk.json';
+import deMessages from './messages/de.json';
+import ruMessages from './messages/ru.json';
+import hiMessages from './messages/hi.json';
+import frCAMessages from './messages/fr_CA.json';
+// no need to import en messages-- they are in the defaultMessage field
 
 const messages = {
   ar: arMessages,
   'es-419': es419Messages,
   fr: frMessages,
   'zh-cn': zhcnMessages,
-  ca: caMessages,
-  he: heMessages,
-  id: idMessages,
-  'ko-kr': kokrMessages,
-  pl: plMessages,
-  'pt-br': ptbrMessages,
+  pt: ptMessages,
+  it: itMessages,
+  de: deMessages,
+  hi: hiMessages,
+  'fr-ca': frCAMessages,
   ru: ruMessages,
-  th: thMessages,
   uk: ukMessages,
 };
 

src/i18n/messages/ar.json

@@ -1,32 +1 @@
-{
-  "footer.socialLinks.srText.facebook": "Like edX on Facebook",
-  "footer.socialLinks.srText.twitter": "Follow edX on Twitter",
-  "footer.socialLinks.srText.youtube": "Subscribe to the edX YouTube channel",
-  "footer.socialLinks.srText.linkedin": "Follow edX on LinkedIn",
-  "footer.socialLinks.srText.reddit": "Subscribe to the edX subreddit",
-  "footer.languageForm.select.label": "Choose Language",
-  "footer.languageForm.submit.label": "Apply",
-  "footer.edxLinks.about": "About",
-  "footer.edxLinks.business": "edX for Business",
-  "footer.edxLinks.affiliates": "Affiliates",
-  "footer.edxLinks.openEdx": "Open edX",
-  "footer.edxLinks.careers": "Careers",
-  "footer.edxLinks.news": "News",
-  "footer.legalLinks.heading": "Legal",
-  "footer.legalLinks.termsOfService": "Terms of Service & Honor Code",
-  "footer.legalLinks.privacyPolicy": "Privacy Policy",
-  "footer.legalLinks.a11yPolicy": "Accessibility Policy",
-  "footer.legalLinks.trademarkPolicy": "Trademark Policy",
-  "footer.legalLinks.sitemap": "Sitemap",
-  "footer.connectLinks.heading": "Connect",
-  "footer.connectLinks.blog": "Blog",
-  "footer.connectLinks.contact": "Contact Us",
-  "footer.connectLinks.help": "Help Center",
-  "footer.connectLinks.mediaKit": "Media Kit",
-  "footer.connectLinks.donate": "Donate",
-  "footer.mobileApp.apple": "Download the edX mobile app from the Apple App Store",
-  "footer.mobileApp.google": "Download the edX mobile app from Google Play",
-  "footer.logo.altText": "Powered by Open edX",
-  "footer.logo.ariaLabel": "edX Home",
-  "footer.ariaLabel": "Page Footer"
-}
+{}

src/i18n/messages/es_419.json

@@ -1,32 +1 @@
-{
-  "footer.socialLinks.srText.facebook": "Like edX on Facebook",
-  "footer.socialLinks.srText.twitter": "Follow edX on Twitter",
-  "footer.socialLinks.srText.youtube": "Subscribe to the edX YouTube channel",
-  "footer.socialLinks.srText.linkedin": "Follow edX on LinkedIn",
-  "footer.socialLinks.srText.reddit": "Subscribe to the edX subreddit",
-  "footer.languageForm.select.label": "Choose Language",
-  "footer.languageForm.submit.label": "Apply",
-  "footer.edxLinks.about": "About",
-  "footer.edxLinks.business": "edX for Business",
-  "footer.edxLinks.affiliates": "Affiliates",
-  "footer.edxLinks.openEdx": "Open edX",
-  "footer.edxLinks.careers": "Careers",
-  "footer.edxLinks.news": "News",
-  "footer.legalLinks.heading": "Legal",
-  "footer.legalLinks.termsOfService": "Terms of Service & Honor Code",
-  "footer.legalLinks.privacyPolicy": "Privacy Policy",
-  "footer.legalLinks.a11yPolicy": "Accessibility Policy",
-  "footer.legalLinks.trademarkPolicy": "Trademark Policy",
-  "footer.legalLinks.sitemap": "Sitemap",
-  "footer.connectLinks.heading": "Connect",
-  "footer.connectLinks.blog": "Blog",
-  "footer.connectLinks.contact": "Contact Us",
-  "footer.connectLinks.help": "Help Center",
-  "footer.connectLinks.mediaKit": "Media Kit",
-  "footer.connectLinks.donate": "Donate",
-  "footer.mobileApp.apple": "Download the edX mobile app from the Apple App Store",
-  "footer.mobileApp.google": "Download the edX mobile app from Google Play",
-  "footer.logo.altText": "Powered by Open edX",
-  "footer.logo.ariaLabel": "edX Home",
-  "footer.ariaLabel": "Page Footer"
-}
+{}

src/i18n/messages/fr.json

@@ -1,32 +1 @@
-{
-  "footer.socialLinks.srText.facebook": "Like edX on Facebook",
-  "footer.socialLinks.srText.twitter": "Follow edX on Twitter",
-  "footer.socialLinks.srText.youtube": "Subscribe to the edX YouTube channel",
-  "footer.socialLinks.srText.linkedin": "Follow edX on LinkedIn",
-  "footer.socialLinks.srText.reddit": "Subscribe to the edX subreddit",
-  "footer.languageForm.select.label": "Choose Language",
-  "footer.languageForm.submit.label": "Apply",
-  "footer.edxLinks.about": "About",
-  "footer.edxLinks.business": "edX for Business",
-  "footer.edxLinks.affiliates": "Affiliates",
-  "footer.edxLinks.openEdx": "Open edX",
-  "footer.edxLinks.careers": "Careers",
-  "footer.edxLinks.news": "News",
-  "footer.legalLinks.heading": "Legal",
-  "footer.legalLinks.termsOfService": "Terms of Service & Honor Code",
-  "footer.legalLinks.privacyPolicy": "Privacy Policy",
-  "footer.legalLinks.a11yPolicy": "Accessibility Policy",
-  "footer.legalLinks.trademarkPolicy": "Trademark Policy",
-  "footer.legalLinks.sitemap": "Sitemap",
-  "footer.connectLinks.heading": "Connect",
-  "footer.connectLinks.blog": "Blog",
-  "footer.connectLinks.contact": "Contact Us",
-  "footer.connectLinks.help": "Help Center",
-  "footer.connectLinks.mediaKit": "Media Kit",
-  "footer.connectLinks.donate": "Donate",
-  "footer.mobileApp.apple": "Download the edX mobile app from the Apple App Store",
-  "footer.mobileApp.google": "Download the edX mobile app from Google Play",
-  "footer.logo.altText": "Powered by Open edX",
-  "footer.logo.ariaLabel": "edX Home",
-  "footer.ariaLabel": "Page Footer"
-}
+{}

src/i18n/messages/pt_br.json

@@ -1 +0,0 @@
-{}

src/i18n/messages/th.json

@@ -1 +0,0 @@
-{}

src/i18n/messages/zh_CN.json

@@ -1,32 +1 @@
-{
-  "footer.socialLinks.srText.facebook": "Like edX on Facebook",
-  "footer.socialLinks.srText.twitter": "Follow edX on Twitter",
-  "footer.socialLinks.srText.youtube": "Subscribe to the edX YouTube channel",
-  "footer.socialLinks.srText.linkedin": "Follow edX on LinkedIn",
-  "footer.socialLinks.srText.reddit": "Subscribe to the edX subreddit",
-  "footer.languageForm.select.label": "Choose Language",
-  "footer.languageForm.submit.label": "Apply",
-  "footer.edxLinks.about": "About",
-  "footer.edxLinks.business": "edX for Business",
-  "footer.edxLinks.affiliates": "Affiliates",
-  "footer.edxLinks.openEdx": "Open edX",
-  "footer.edxLinks.careers": "Careers",
-  "footer.edxLinks.news": "News",
-  "footer.legalLinks.heading": "Legal",
-  "footer.legalLinks.termsOfService": "Terms of Service & Honor Code",
-  "footer.legalLinks.privacyPolicy": "Privacy Policy",
-  "footer.legalLinks.a11yPolicy": "Accessibility Policy",
-  "footer.legalLinks.trademarkPolicy": "Trademark Policy",
-  "footer.legalLinks.sitemap": "Sitemap",
-  "footer.connectLinks.heading": "Connect",
-  "footer.connectLinks.blog": "Blog",
-  "footer.connectLinks.contact": "Contact Us",
-  "footer.connectLinks.help": "Help Center",
-  "footer.connectLinks.mediaKit": "Media Kit",
-  "footer.connectLinks.donate": "Donate",
-  "footer.mobileApp.apple": "Download the edX mobile app from the Apple App Store",
-  "footer.mobileApp.google": "Download the edX mobile app from Google Play",
-  "footer.logo.altText": "Powered by Open edX",
-  "footer.logo.ariaLabel": "edX Home",
-  "footer.ariaLabel": "Page Footer"
-}
+{}