moved to new eslint config

bedrockio · Jan 27, 2025 · 2436b69 · 2436b69
1 parent 9cade18
commit 2436b69
Show file tree

Hide file tree

Showing 19 changed files with 2,519 additions and 921 deletions.
diff --git a/services/web/.eslintignore b/services/web/.eslintignore
diff --git a/services/web/.eslintrc.js b/services/web/.eslintrc.js
diff --git a/services/web/eslint.config.js b/services/web/eslint.config.js
@@ -0,0 +1,42 @@
+const babelParser = require('@babel/eslint-parser');
+const {
+  mdx,
+  jest,
+  react,
+  recommended,
+  webpackImports,
+} = require('@bedrockio/eslint-plugin');
+
+module.exports = [
+  recommended,
+  jest,
+  mdx,
+  {
+    files: ['src/**/*.js'],
+    languageOptions: {
+      parser: babelParser,
+      parserOptions: {
+        ecmaVersion: 'latest',
+        sourceType: 'module',
+        ecmaFeatures: {
+          jsx: true,
+        },
+        babelOptions: {
+          plugins: [['@babel/plugin-proposal-decorators', { legacy: true }]],
+        },
+      },
+    },
+    plugins: {
+      ...react.plugins,
+      ...webpackImports.plugins,
+    },
+    settings: {
+      ...react.settings,
+      ...webpackImports.settings,
+    },
+    rules: {
+      ...react.rules,
+      ...webpackImports.rules,
+    },
+  },
+];
diff --git a/services/web/package.json b/services/web/package.json
@@ -78,16 +78,16 @@
     "webpack-hot-middleware": "^2.25.4"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.19.1",
+    "@babel/eslint-parser": "^7.26.5",
+    "@bedrockio/eslint-plugin": "^1.1.1",
     "@bedrockio/prettier-config": "^1.0.2",
     "@testing-library/dom": "^9.0.0",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.4.3",
     "babel-jest": "^29.4.3",
-    "eslint": "^8.33.0",
-    "eslint-import-resolver-webpack": "^0.13.2",
-    "eslint-plugin-bedrock": "^1.0.25",
-    "eslint-plugin-mdx": "^1.17.1",
+    "eslint": "^9.19.0",
+    "eslint-import-resolver-webpack": "^0.13.10",
+    "eslint-plugin-mdx": "^3.1.5",
     "jest": "^29.4.3",
     "jest-environment-jsdom": "^29.5.0",
     "node-mocks-http": "^1.8.1",

diff --git a/services/web/serve/static.js b/services/web/serve/static.js
@@ -45,7 +45,6 @@ app.listen(SERVER_PORT, SERVER_HOST, (err) => {
     throw err;
   }
 
-  // eslint-disable-next-line
   logger.info(
     `🐬  Prod App server listening at http://${SERVER_HOST}:${SERVER_PORT} 🐬\r\n\r\n`
   );

diff --git a/services/web/src/components/DateInput.js b/services/web/src/components/DateInput.js
@@ -1,15 +1,12 @@
 import { useState, useMemo } from 'react';
 
-// eslint-disable-next-line
 import { isValid } from 'date-fns';
-// eslint-disable-next-line
 import { DayPicker } from 'react-day-picker';
 
 import { Popup, Input, Icon } from 'semantic';
 
 import { formatDate } from 'utils/date';
 
-// eslint-disable-next-line
 import 'react-day-picker/style.css';
 import './date-input.less';
 

diff --git a/services/web/src/components/Logo.js b/services/web/src/components/Logo.js
@@ -1,10 +1,10 @@
 import { useTheme } from 'stores/theme';
 
+import { APP_NAME } from 'utils/env';
+
 import logoLight from 'assets/logo-light.svg';
 import logoDark from 'assets/logo-dark.svg';
 
-import { APP_NAME } from 'utils/env';
-
 export default function Logo(props) {
   const { currentTheme } = useTheme();
   const src = currentTheme === 'dark' ? logoDark : logoLight;

diff --git a/services/web/src/docs/screens/IconSheet.js b/services/web/src/docs/screens/IconSheet.js
@@ -2087,7 +2087,8 @@ export default class IconSheetScreen extends React.Component {
                 <p>
                   <a
                     href="https://fontawesome.com/search?o=r&m=free&f=brands"
-                    target="_blank">
+                    target="_blank"
+                    rel="noreferrer">
                     Font Awesome Free
                   </a>{' '}
                   6.2.0

diff --git a/services/web/src/index.js b/services/web/src/index.js
@@ -64,4 +64,5 @@ const Wrapper = () => (
   </BrowserRouter>
 );
 
+// eslint-disable-next-line
 ReactDOM.render(<Wrapper />, document.getElementById('root'));
diff --git a/services/web/src/layouts/Dashboard.js b/services/web/src/layouts/Dashboard.js
@@ -9,14 +9,14 @@ import Footer from 'components/Footer';
 import Layout from 'components/Layout';
 import Protected from 'components/Protected';
 import Organization from 'modals/OrganizationSelector';
-
 import ConnectionError from 'components/ConnectionError';
-import favicon from 'assets/favicon.svg';
 
 import { userCanSwitchOrganizations } from 'utils/permissions';
 
 import Sidebar from './Sidebar';
 
+import favicon from 'assets/favicon.svg';
+
 @withSession
 export default class DashboardLayout extends React.Component {
   render() {

diff --git a/services/web/src/screens/Shops/Detail/Overview.js b/services/web/src/screens/Shops/Detail/Overview.js
@@ -1,12 +1,11 @@
 import React from 'react';
-/* eslint-disable-next-line */
 import { Table, Divider } from 'semantic';
 
 import { usePage } from 'stores/page';
 import screen from 'helpers/screen';
 
 // --- Generator: overview-imports
-/* eslint-disable-next-line */
+// eslint-disable-next-line
 import { Header, Image } from 'semantic';
 import { arrayToList, formatAddress } from 'utils/formatting';
 

diff --git a/services/web/src/screens/Shops/List/index.js b/services/web/src/screens/Shops/List/index.js
@@ -1,5 +1,4 @@
 import React from 'react';
-/* eslint-disable-next-line */
 import { Table, Button, Divider, Segment } from 'semantic';
 import { Link } from 'react-router-dom';
 

diff --git a/services/web/src/semantic/index.js b/services/web/src/semantic/index.js
@@ -47,7 +47,5 @@ import './modules/sticky.less';
 import './modules/tab.less';
 import './modules/transition.less';
 
-// eslint-disable-next-line
 export * from 'semantic-ui-react';
-// eslint-disable-next-line
 export { default as Icon } from './elements/Icon';
diff --git a/services/web/src/stores/session.js b/services/web/src/stores/session.js
@@ -148,7 +148,7 @@ export class SessionProvider extends React.PureComponent {
           method: 'POST',
           path: '/1/auth/logout',
         });
-      } catch (err) {
+      } catch {
         // JWT token errors may throw here
       }
       setToken(null);
@@ -236,7 +236,7 @@ export class SessionProvider extends React.PureComponent {
       if (str) {
         data = JSON.parse(str);
       }
-    } catch (err) {
+    } catch {
       localStorage.removeItem('session');
     }
     return data || {};

diff --git a/services/web/src/utils/api/request.js b/services/web/src/utils/api/request.js
@@ -62,7 +62,7 @@ export default async function request(options) {
         message = response.error.message;
         status = response.error.status;
       }
-    } catch (err) {
+    } catch {
       message = await res.clone().text();
     }
     throw new ApiError(message, type, status, response);
@@ -72,7 +72,7 @@ export default async function request(options) {
     try {
       response = await res.json();
       trackRequest(options, response.data);
-    } catch (err) {
+    } catch {
       throw new ApiParseError();
     }
   }

diff --git a/services/web/src/utils/fetch.js b/services/web/src/utils/fetch.js
@@ -58,7 +58,7 @@ async function fetchWithNetworkError(url, options) {
     // as bad CORS headers etc will still reject asynchoronously,
     // so this could potentially be better.
     return await promise;
-  } catch (err) {
+  } catch {
     throw new NetworkError();
   }
 }

diff --git a/services/web/src/utils/storage.js b/services/web/src/utils/storage.js
@@ -5,7 +5,7 @@ function storageAvailable(type) {
     storage.setItem(x, x);
     storage.removeItem(x);
     return true;
-  } catch (e) {
+  } catch {
     return false;
   }
 }

diff --git a/services/web/src/utils/token.js b/services/web/src/utils/token.js
@@ -10,7 +10,7 @@ export function getUrlToken(param = 'token') {
 export function parseToken(token) {
   try {
     return JSON.parse(atob(token.split('.')[1]));
-  } catch (err) {
+  } catch {
     return null;
   }
 }