merges eslint-config

src/client/components/data/User.js

@@ -5,7 +5,7 @@ import jwt from 'jsonwebtoken';
 import { useLocation, useHistory } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import config from 'payload/config';
-import { useModal } from '@trbl/react-modal';
+import { useModal } from '@faceless-ui/modal';
 import { requests } from '../../api';
 import StayLoggedInModal from '../modals/StayLoggedIn';
 import useDebounce from '../../hooks/useDebounce';

src/client/components/elements/DeleteDocument/index.js

@@ -2,7 +2,7 @@ import React, { useState, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import config from 'payload/config';
 import { useHistory } from 'react-router-dom';
-import { Modal, useModal } from '@trbl/react-modal';
+import { Modal, useModal } from '@faceless-ui/modal';
 import Button from '../Button';
 import MinimalTemplate from '../../templates/Minimal';
 import useTitle from '../../../hooks/useTitle';

src/client/components/elements/Popup/index.js

@@ -1,7 +1,7 @@
 import React, { useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
-import { useWindowInfo } from '@trbl/react-window-info';
-import { useScrollInfo } from '@trbl/react-scroll-info';
+import { useWindowInfo } from '@faceless-ui/window-info';
+import { useScrollInfo } from '@faceless-ui/scroll-info';
 
 import useThrottledEffect from '../../../hooks/useThrottledEffect';
 import PopupButton from './PopupButton';
@@ -115,8 +115,7 @@ const Popup = (props) => {
               setActive={setActive}
               active={active}
             />
-          )
-        }
+          )}
       </div>
 
       <div

src/client/components/forms/field-types/Upload/Add/index.js

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import PropTypes from 'prop-types';
-import { Modal, useModal } from '@trbl/react-modal';
+import { Modal, useModal } from '@faceless-ui/modal';
 import config from '../../../../../config';
 import MinimalTemplate from '../../../../templates/Minimal';
 import Form from '../../../Form';
@@ -67,7 +67,7 @@ const AddUploadModal = (props) => {
             />
           </header>
           <RenderFields
-            filter={field => (!field.position || (field.position && field.position !== 'sidebar'))}
+            filter={(field) => (!field.position || (field.position && field.position !== 'sidebar'))}
             fieldTypes={fieldTypes}
             fieldSchema={fields}
             customComponentsPath={`${collection.slug}.fields.`}

src/client/components/forms/field-types/Upload/SelectExisting/index.js

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { Modal, useModal } from '@trbl/react-modal';
+import { Modal, useModal } from '@faceless-ui/modal';
 import config from '../../../../../config';
 import MinimalTemplate from '../../../../templates/Minimal';
 import Button from '../../../../elements/Button';

src/client/components/forms/field-types/Upload/index.js

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { useModal } from '@trbl/react-modal';
+import { useModal } from '@faceless-ui/modal';
 import config from '../../../../config';
 import useFieldType from '../../useFieldType';
 import withCondition from '../../withCondition';
@@ -37,7 +37,7 @@ const Upload = (props) => {
     fieldTypes,
   } = props;
 
-  const collection = collections.find(coll => coll.slug === relationTo);
+  const collection = collections.find((coll) => coll.slug === relationTo);
 
   const path = pathFromProps || name;
   const addModalSlug = `${path}-add`;
@@ -104,7 +104,7 @@ const Upload = (props) => {
         required={required}
       />
       {collection?.upload && (
-        <>
+        <React.Fragment>
           {internalValue && (
             <FileDetails
               {...collection.upload}
@@ -157,7 +157,7 @@ const Upload = (props) => {
             addModalSlug,
           }}
           />
-        </>
+        </React.Fragment>
       )}
     </div>
   );

src/client/components/index.js

@@ -1,9 +1,9 @@
 import React from 'react';
 import { render } from 'react-dom';
 import { BrowserRouter as Router } from 'react-router-dom';
-import { ScrollInfoProvider } from '@trbl/react-scroll-info';
-import { WindowInfoProvider } from '@trbl/react-window-info';
-import { ModalProvider, ModalContainer } from '@trbl/react-modal';
+import { ScrollInfoProvider } from '@faceless-ui/scroll-info';
+import { WindowInfoProvider } from '@faceless-ui/window-info';
+import { ModalProvider, ModalContainer } from '@faceless-ui/modal';
 import { SearchParamsProvider } from './utilities/SearchParams';
 import { LocaleProvider } from './utilities/Locale';
 import StatusList, { StatusListProvider } from './elements/Status';

src/client/components/modals/StayLoggedIn/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useHistory } from 'react-router-dom';
-import { useModal, Modal } from '@trbl/react-modal';
+import { useModal, Modal } from '@faceless-ui/modal';
 import config from 'payload/config';
 import MinimalTemplate from '../../templates/Minimal';
 import Button from '../../elements/Button';

src/client/components/utilities/RenderCustomComponent/index.js

@@ -37,6 +37,7 @@ const RenderCustomComponent = (props) => {
 
 RenderCustomComponent.defaultProps = {
   path: undefined,
+  componentProps: {},
 };
 
 RenderCustomComponent.propTypes = {
@@ -47,7 +48,7 @@ RenderCustomComponent.propTypes = {
     PropTypes.node,
     PropTypes.element,
   ]).isRequired,
-  componentProps: PropTypes.shape({}).isRequired,
+  componentProps: PropTypes.shape({}),
 };
 
 export default RenderCustomComponent;

src/webpack/getWebpackDevConfig.js

@@ -34,7 +34,7 @@ module.exports = (config) => {
         {
           test: /\.js$/,
           exclude: /node_modules/,
-          use: {
+          use: [{
             loader: 'babel-loader',
             options: {
               presets: [
@@ -58,6 +58,14 @@ module.exports = (config) => {
               ],
             },
           },
+            // {
+            //   loader: 'eslint-loader',
+            //   options: {
+            //     fix: true,
+            //     emitWarning: true,
+            //   },
+            // }
+          ],
         },
         {
           // "oneOf" will traverse all following loaders until one will