fix: Updated front-build to v12 (#354)

* chore: updated frontend-build version & resolved eslint issues * fix: useMemo hook removed from JSX, eslint issue ignored
openedx · Aug 11, 2022 · da4899a · da4899a
1 parent ef8baa3
commit da4899a
Show file tree

Hide file tree

Showing 12 changed files with 5,630 additions and 6,453 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,10 +1,11 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
 const { getBaseConfig } = require('@edx/frontend-build');
 
 const config = getBaseConfig('eslint');
 
 config.rules = {
   'import/no-extraneous-dependencies': ['error', {
-    'devDependencies': [
+    devDependencies: [
       '**/*.config.js',
       '**/*.test.jsx',
       '**/*.test.js',
@@ -19,7 +20,6 @@ config.rules = {
   }],
   'jsx-a11y/anchor-is-valid': ['error', {
     components: ['Link'],
-    specialLink: [],
     specialLink: ['to'],
     aspects: ['noHref', 'invalidHref', 'preferButton'],
   }],

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
   "homepage": "https://github.com/edx/frontend-platform#readme",
   "devDependencies": {
     "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
-    "@edx/frontend-build": "9.2.2",
+    "@edx/frontend-build": "^12.0.3",
     "@edx/paragon": "20.2.0",
     "axios-mock-adapter": "1.20.0",
     "core-js": "3.21.1",

diff --git a/src/auth/MockAuthService.js b/src/auth/MockAuthService.js
@@ -256,7 +256,7 @@ class MockAuthService {
     }
 
     return this.getAuthenticatedUser();
-  })
+  });
 
   /**
    * A Jest mock function (jest.fn())

diff --git a/src/auth/interceptors/createRetryInterceptor.js b/src/auth/interceptors/createRetryInterceptor.js
@@ -52,7 +52,7 @@ const createRetryInterceptor = (options = {}) => {
       try {
         const backoffDelay = getBackoffMilliseconds(nthRetry);
         // Delay (wrapped in a promise so we can await the setTimeout)
-        await new Promise(resolve => setTimeout(resolve, backoffDelay));
+        await new Promise(resolve => { setTimeout(resolve, backoffDelay); });
         // Make retry request
         retryResponse = await httpClient.request(config);
       } catch (e) {

diff --git a/src/i18n/countries.js b/src/i18n/countries.js
@@ -10,20 +10,20 @@ import { getPrimaryLanguageSubtag } from './lib';
  * TODO: When we start dynamically loading translations only for the current locale, change this.
  */
 
-COUNTRIES.registerLocale(require('i18n-iso-countries/langs/ar.json'));
-COUNTRIES.registerLocale(require('i18n-iso-countries/langs/en.json'));
-COUNTRIES.registerLocale(require('i18n-iso-countries/langs/es.json'));
-COUNTRIES.registerLocale(require('i18n-iso-countries/langs/fr.json'));
-COUNTRIES.registerLocale(require('i18n-iso-countries/langs/zh.json'));
-COUNTRIES.registerLocale(require('i18n-iso-countries/langs/ca.json'));
-COUNTRIES.registerLocale(require('i18n-iso-countries/langs/he.json'));
-COUNTRIES.registerLocale(require('i18n-iso-countries/langs/id.json'));
-COUNTRIES.registerLocale(require('i18n-iso-countries/langs/ko.json'));
-COUNTRIES.registerLocale(require('i18n-iso-countries/langs/pl.json'));
-COUNTRIES.registerLocale(require('i18n-iso-countries/langs/pt.json'));
-COUNTRIES.registerLocale(require('i18n-iso-countries/langs/ru.json'));
+COUNTRIES.registerLocale(require('i18n-iso-countries/langs/ar'));
+COUNTRIES.registerLocale(require('i18n-iso-countries/langs/en'));
+COUNTRIES.registerLocale(require('i18n-iso-countries/langs/es'));
+COUNTRIES.registerLocale(require('i18n-iso-countries/langs/fr'));
+COUNTRIES.registerLocale(require('i18n-iso-countries/langs/zh'));
+COUNTRIES.registerLocale(require('i18n-iso-countries/langs/ca'));
+COUNTRIES.registerLocale(require('i18n-iso-countries/langs/he'));
+COUNTRIES.registerLocale(require('i18n-iso-countries/langs/id'));
+COUNTRIES.registerLocale(require('i18n-iso-countries/langs/ko'));
+COUNTRIES.registerLocale(require('i18n-iso-countries/langs/pl'));
+COUNTRIES.registerLocale(require('i18n-iso-countries/langs/pt'));
+COUNTRIES.registerLocale(require('i18n-iso-countries/langs/ru'));
 // COUNTRIES.registerLocale(require('i18n-iso-countries/langs/th.json')); // Doesn't exist in lib.
-COUNTRIES.registerLocale(require('i18n-iso-countries/langs/uk.json'));
+COUNTRIES.registerLocale(require('i18n-iso-countries/langs/uk'));
 
 /**
  * Provides a lookup table of country IDs to country names for the current locale.

diff --git a/src/i18n/languages.js b/src/i18n/languages.js
@@ -14,16 +14,16 @@ import { getPrimaryLanguageSubtag } from './lib';
  */
 
 // LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/ar.json'));
-LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/en.json'));
-LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/es.json'));
-LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/fr.json'));
+LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/en'));
+LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/es'));
+LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/fr'));
 // LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/zh.json'));
 // LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/ca.json'));
 // LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/he.json'));
 // LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/id.json'));
 // LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/ko.json'));
-LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/pl.json'));
-LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/pt.json'));
+LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/pl'));
+LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/pt'));
 // LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/ru.json'));
 // LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/th.json'));
 // LANGUAGES.registerLocale(require('@cospired/i18n-iso-languages/langs/uk.json'));

diff --git a/src/react/AppProvider.jsx b/src/react/AppProvider.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { Router } from 'react-router-dom';
 
@@ -61,15 +61,17 @@ export default function AppProvider({ store, children }) {
     setLocale(getLocale());
   });
 
+  const appContextValue = useMemo(() => ({ authenticatedUser, config, locale }), [authenticatedUser, config, locale]);
+
   return (
     <IntlProvider locale={locale} messages={getMessages()}>
       <ErrorBoundary>
         <AppContext.Provider
-          value={{ authenticatedUser, config, locale }}
+          value={appContextValue}
         >
           <OptionalReduxProvider store={store}>
             <Router history={history}>
-              <>{children}</>
+              {children}
             </Router>
           </OptionalReduxProvider>
         </AppContext.Provider>

diff --git a/src/react/AuthenticatedPageRoute.test.jsx b/src/react/AuthenticatedPageRoute.test.jsx
@@ -1,3 +1,4 @@
+/* eslint-disable react/jsx-no-constructed-context-values */
 import React from 'react';
 import { mount } from 'enzyme';
 import { Router, Route } from 'react-router-dom';

diff --git a/src/react/OptionalReduxProvider.jsx b/src/react/OptionalReduxProvider.jsx
@@ -8,9 +8,7 @@ import { Provider } from 'react-redux';
  */
 export default function OptionalReduxProvider({ store, children }) {
   if (store === null) {
-    return (
-      <>{children}</>
-    );
+    return children;
   }
 
   return (

diff --git a/src/react/PageRoute.jsx b/src/react/PageRoute.jsx
@@ -22,6 +22,7 @@ export default function PageRoute(props) {
     if (match) {
       sendPageEvent();
     }
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [JSON.stringify(match)]);
 
   return (

diff --git a/src/react/hooks.js b/src/react/hooks.js
@@ -19,5 +19,5 @@ export const useAppEvent = (type, callback) => {
     return function cleanup() {
       unsubscribe(subscriptionToken);
     };
-  }, []);
+  }, [callback, type]);
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -256,7 +256,7 @@ class MockAuthService { @@
         }
         return this.getAuthenticatedUser();
-      })
+      });
       /**
        * A Jest mock function (jest.fn())
@@ Expand Down @@