fix: updated frontend-build to resolve word-wrap ReDoS vulnerability (#316)

* chore: updated frontend-build to bump eslint version

* refactor: updated package-lock

.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/CODEOWNERS

@@ -1 +0,0 @@
-* @edx/community-engineering

.github/workflows/add-depr-ticket-to-depr-board.yml

@@ -0,0 +1,19 @@
+# Run the workflow that adds new tickets that are either:
+# - labelled "DEPR"
+# - title starts with "[DEPR]"
+# - body starts with "Proposal Date" (this is the first template field)
+# to the org-wide DEPR project board
+
+name: Add newly created DEPR issues to the DEPR project board
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  routeissue:
+    uses: openedx/.github/.github/workflows/add-depr-ticket-to-depr-board.yml@master
+    secrets:
+      GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
+      GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}
+      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}

.github/workflows/add-remove-label-on-comment.yml

@@ -0,0 +1,20 @@
+# This workflow runs when a comment is made on the ticket
+# If the comment starts with "label: " it tries to apply
+# the label indicated in rest of comment.
+# If the comment starts with "remove label: ", it tries
+# to remove the indicated label.
+# Note: Labels are allowed to have spaces and this script does
+# not parse spaces (as often a space is legitimate), so the command
+# "label: really long lots of words label" will apply the
+# label "really long lots of words label"
+
+name: Allows for the adding and removing of labels via comment
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  add_remove_labels:
+    uses: openedx/.github/.github/workflows/add-remove-label-on-comment.yml@master
+

.github/workflows/ci.yml

@@ -1,17 +1,25 @@
 name: Default CI
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - '**'
 jobs:
-  build:
+  tests:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
+    - name: Setup Nodejs Env
+      run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
     - name: Setup Nodejs
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
-        node-version: 12
+        node-version: ${{ env.NODE_VER }}
     - name: Install dependencies
       run: npm ci
     - name: Validate package-lock.json changes
@@ -20,7 +28,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@v1
+      uses: codecov/codecov-action@v3

.github/workflows/commitlint.yml

@@ -0,0 +1,10 @@
+# Run commitlint on the commit messages in a pull request.
+
+name: Lint Commit Messages
+
+on:
+  - pull_request
+
+jobs:
+  commitlint:
+    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-v3.yml@master

.github/workflows/release.yml

@@ -2,36 +2,38 @@ 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@v1
-        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@v1
-      - 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 Nodejs Env
+      run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
+    - name: Setup Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ env.NODE_VER }}
+    - 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

.github/workflows/self-assign-issue.yml

@@ -0,0 +1,12 @@
+# This workflow runs when a comment is made on the ticket
+# If the comment starts with "assign me" it assigns the author to the
+# ticket (case insensitive)
+
+name: Assign comment author to ticket if they say "assign me"
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  self_assign_by_comment:
+    uses: openedx/.github/.github/workflows/self-assign-issue.yml@master

.nvmrc

@@ -0,0 +1 @@
+18

.tx/config

@@ -1,8 +1,9 @@
 [main]
 host = https://www.transifex.com
 
-[edx-platform.frontend-component-footer]
+[o:open-edx:p:edx-platform:r:frontend-component-footer]
 file_filter = src/i18n/messages/<lang>.json
 source_file = src/i18n/transifex_input.json
 source_lang = en
-type = KEYVALUEJSON
+type        = KEYVALUEJSON
+

Makefile

@@ -1,11 +1,9 @@
-transifex_resource = frontend-component-footer
-transifex_langs = "ar,fr,es_419,zh_CN"
+export TRANSIFEX_RESOURCE = frontend-component-footer
+transifex_langs = "ar,fr,es_419,zh_CN,pt,it,de,uk,ru,hi,fr_CA,it_IT,pt_PT,de_DE"
 
 transifex_utils = ./node_modules/.bin/transifex-utils.js
 i18n = ./src/i18n
 transifex_input = $(i18n)/transifex_input.json
-tx_url1 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/translation/en/strings/
-tx_url2 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/source/
 
 # This directory must match .babelrc .
 transifex_temp = ./temp/babel-plugin-react-intl
@@ -42,15 +40,15 @@ push_translations:
 	# Pushing strings to Transifex...
 	tx push -s
 	# Fetching hashes from Transifex...
-	./node_modules/reactifex/bash_scripts/get_hashed_strings.sh $(tx_url1)
+	./node_modules/@edx/reactifex/bash_scripts/get_hashed_strings_v3.sh
 	# Writing out comments to file...
-	$(transifex_utils) $(transifex_temp) --comments
+	$(transifex_utils) $(transifex_temp) --comments --v3-scripts-path
 	# Pushing comments to Transifex...
-	./node_modules/reactifex/bash_scripts/put_comments.sh $(tx_url2)
+	./node_modules/@edx/reactifex/bash_scripts/put_comments_v3.sh
 
 # Pulls translations from Transifex.
 pull_translations:
-	tx pull -f --mode reviewed --language=$(transifex_langs)
+	tx pull -t -f --mode reviewed --languages=$(transifex_langs)
 
 # This target is used by Travis.
 validate-no-uncommitted-package-lock-changes:

README.rst

@@ -14,13 +14,14 @@ 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
 =====================
 
 This component requires that the following environment variable be set by the consuming micro-frontend.
 
+* ``LMS_BASE_URL`` - The URL of the LMS of your Open edX instance.
 * ``LOGO_TRADEMARK_URL`` - This is a URL to a logo for use in the footer.  This is a different environment variable than ``LOGO_URL`` (used in frontend-component-header) to accommodate sites that would like to have additional trademark information on a logo in the footer, such as a (tm) or (r) symbol.
 
 ************
@@ -67,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

commitlint.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-  extends: ['@commitlint/config-angular'],
-};

package.json

@@ -19,53 +19,49 @@
   ],
   "husky": {
     "hooks": {
-      "pre-commit": "npm run lint",
-      "commit-msg": "commitlint -e $GIT_PARAMS"
+      "pre-commit": "npm run lint"
     }
   },
   "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": {
-    "@commitlint/cli": "8.3.5",
-    "@commitlint/config-angular": "8.3.4",
-    "@commitlint/prompt": "8.3.5",
-    "@commitlint/prompt-cli": "8.3.5",
-    "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
-    "@edx/frontend-build": "5.4.0",
-    "@edx/frontend-platform": "1.8.4",
-    "@edx/paragon": "12.0.5",
-    "codecov": "3.8.2",
+    "@edx/brand": "npm:@edx/brand-openedx@1.2.0",
+    "@edx/browserslist-config": "^1.1.1",
+    "@edx/frontend-build": "12.8.61",
+    "@edx/frontend-platform": "4.6.0",
+    "@edx/paragon": "^20.44.0",
+    "@edx/reactifex": "^2.1.1",
+    "@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
     "enzyme": "3.11.0",
-    "enzyme-adapter-react-16": "1.15.6",
-    "husky": "3.1.0",
-    "prop-types": "15.7.2",
-    "react": "16.10.2",
-    "react-dom": "16.10.2",
-    "react-redux": "7.1.1",
-    "react-router-dom": "5.1.2",
-    "react-test-renderer": "16.10.2",
-    "reactifex": "1.1.1",
-    "redux": "4.0.4"
+    "husky": "8.0.3",
+    "prop-types": "15.8.1",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
+    "react-redux": "7.2.9",
+    "react-router-dom": "5.3.4",
+    "react-test-renderer": "17.0.2",
+    "redux": "4.2.1",
+    "semantic-release": "21.0.7"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "1.2.35",
-    "@fortawesome/free-brands-svg-icons": "5.15.3",
-    "@fortawesome/free-regular-svg-icons": "5.15.3",
-    "@fortawesome/free-solid-svg-icons": "5.15.3",
-    "@fortawesome/react-fontawesome": "0.1.14"
+    "@fortawesome/fontawesome-svg-core": "6.4.0",
+    "@fortawesome/free-brands-svg-icons": "6.4.0",
+    "@fortawesome/free-regular-svg-icons": "6.4.0",
+    "@fortawesome/free-solid-svg-icons": "6.4.0",
+    "@fortawesome/react-fontawesome": "0.2.0"
   },
   "peerDependencies": {
-    "@edx/frontend-platform": "^1.8.0",
+    "@edx/frontend-platform": "^4.0.0",
     "prop-types": "^15.5.10",
-    "react": "^16.9.0",
-    "react-dom": "^16.9.0"
+    "react": "^16.9.0 || ^17.0.0",
+    "react-dom": "^16.9.0 || ^17.0.0"
   }
 }

renovate.json

@@ -2,7 +2,9 @@
   "extends": [
     "config:base",
     "schedule:weekly",
+    ":automergeLinters",
     ":automergeMinor",
+    ":automergeTesters",
     ":enableVulnerabilityAlerts",
     ":rebaseStalePrs",
     ":semanticCommits",
@@ -11,9 +13,19 @@
   "packageRules": [
     {
       "matchDepTypes": [
-        "devDependencies",
-        "lockFileMaintenance"
+        "devDependencies"
       ],
+      "matchUpdateTypes": [
+        "lockFileMaintenance",
+        "minor",
+        "patch",
+        "pin"
+      ],
+      "automerge": true
+    },
+    {
+      "matchPackagePatterns": ["@edx"],
+      "matchUpdateTypes": ["minor", "patch"],
       "automerge": true
     }
   ],

src/components/Footer.jsx

@@ -9,6 +9,7 @@ import messages from './Footer.messages';
 import LanguageSelector from './LanguageSelector';
 
 ensureConfig([
+  'LMS_BASE_URL',
   'LOGO_TRADEMARK_URL',
 ], 'Footer component');
 
@@ -22,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;
@@ -58,7 +51,7 @@ class SiteFooter extends React.Component {
         <div className="container-fluid d-flex">
           <a
             className="d-block"
-            href="https://open.edx.org"
+            href={config.LMS_BASE_URL}
             aria-label={intl.formatMessage(messages['footer.logo.ariaLabel'])}
           >
             <img

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,68 +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,
-                },
-              }}
-            >
-              <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,
-                },
-              }}
-            >
-              <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,
-                },
-              }}
-            >
-              <Footer
-                onLanguageSelected={() => {}}
-                supportedLanguages={[
-                  { label: 'English', value: 'en' },
-                  { label: 'Español', value: 'es' },
-                ]}
-              />
-            </AppContext.Provider>
-          </IntlProvider>
-        ))
+        .create(<FooterWithLanguageSelector />)
         .toJSON();
       expect(tree).toMatchSnapshot();
     });
@@ -76,26 +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,
-              },
-            }}
-          >
-            <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

@@ -11,7 +11,7 @@ exports[`<Footer /> renders correctly renders with a language selector 1`] = `
     <a
       aria-label="edX Home"
       className="d-block"
-      href="https://open.edx.org"
+      href="http://localhost:18000"
     >
       <img
         alt="Powered by Open edX"
@@ -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>
@@ -83,7 +79,7 @@ exports[`<Footer /> renders correctly renders without a language selector 1`] =
     <a
       aria-label="edX Home"
       className="d-block"
-      href="https://open.edx.org"
+      href="http://localhost:18000"
     >
       <img
         alt="Powered by Open edX"
@@ -113,7 +109,7 @@ exports[`<Footer /> renders correctly renders without a language selector in es
     <a
       aria-label="edX Home"
       className="d-block"
-      href="https://open.edx.org"
+      href="http://localhost:18000"
     >
       <img
         alt="Powered by Open edX"

src/i18n/index.js

@@ -1,32 +1,34 @@
 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';
+import dedeCAMessages from './messages/de_DE.json';
+import ititCAMessages from './messages/it_IT.json';
+import ptptCAMessages from './messages/pt_PT.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,
+  'de-de': dedeCAMessages,
+  'it-it': ititCAMessages,
+  'pt-pt': ptptCAMessages,
 };
 
 export default messages;

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_PT.json

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

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"
-}
+{}

src/setupTest.js

@@ -1,5 +1,5 @@
 import Enzyme from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 
 Enzyme.configure({ adapter: new Adapter() });