Adding prettier for code formatting, disabling ESLint formatting rules.

.github/workflows/fix-linter-hints.yml

@@ -36,6 +36,9 @@ jobs:
         continue-on-error: true
         working-directory: graylog2-web-interface
         run: yarn lint --fix -o /tmp/report.json -f json
+      - name: Runt prettier
+        working-directory: graylog2-web-interface
+        run: yarn format
       - name: Run lint:styles --fix
         continue-on-error: true
         working-directory: graylog2-web-interface
@@ -54,7 +57,7 @@ jobs:
           author: Dr. Lint-a-lot <[email protected]>
           branch: fix/linter-hints
           committer: Dr. Lint-a-lot <[email protected]>
-          commit-message: Running lint --fix
+          commit-message: Running lint --fix & prettier
           delete-branch: true
 
       - name: Get headRef and SHA of PR

graylog2-web-interface/.prettierrc.json

@@ -0,0 +1 @@
+"@graylog/prettier-config"

graylog2-web-interface/package.json

@@ -24,7 +24,8 @@
     "lint:changes": "./dev/lintChanges.sh",
     "test": "jest --maxWorkers=50%",
     "test:integration": "jest --maxWorkers=50% --config jest.it.config.js",
-    "check-production-build": "node checkProductionBuild.js"
+    "check-production-build": "node checkProductionBuild.js",
+    "format": "prettier --write src"
   },
   "eslintConfig": {
     "extends": "graylog"
@@ -116,6 +117,7 @@
   "devDependencies": {
     "@cfaester/enzyme-adapter-react-18": "0.7.1",
     "@cyclonedx/webpack-plugin": "^3.9.1",
+    "@graylog/prettier-config": "^1.0.2",
     "@types/chroma-js": "^2.1.3",
     "@types/crossfilter": "0.0.38",
     "@types/enzyme-adapter-react-16": "^1.0.6",
@@ -162,6 +164,7 @@
     "less": "^4.1.2",
     "less-loader": "^12.0.0",
     "node-fetch": "^2.6.1",
+    "prettier": "^3.3.3",
     "puppeteer": "^23.0.2",
     "react-bootstrap": "0.33.1",
     "style-loader": "3.3.4",

graylog2-web-interface/packages/eslint-config-graylog/index.js

@@ -79,6 +79,7 @@ module.exports = {
     'plugin:import/react',
     'plugin:jest-formatting/strict',
     'plugin:graylog/recommended',
+    'prettier',
   ],
   plugins: [
     'import',
@@ -89,7 +90,6 @@ module.exports = {
   rules: {
     'arrow-body-style': ['error', 'as-needed'],
     camelcase: 'off',
-    'function-paren-newline': 'off',
     'import/extensions': 'off',
     'import/no-extraneous-dependencies': 'off',
     'import/no-unresolved': 'off',
@@ -121,18 +121,12 @@ module.exports = {
       }],
     }],
     'no-underscore-dangle': 'off',
-    'object-curly-newline': ['error', { multiline: true, consistent: true }],
     'object-shorthand': ['error', 'methods'],
     'react/destructuring-assignment': 'off',
     'react/forbid-prop-types': 'off',
     'react/function-component-definition': 'off',
-    'react/jsx-closing-bracket-location': ['warn', 'after-props'],
-    'react/jsx-curly-spacing': ['warn', { when: 'never', children: true }],
     'react/jsx-filename-extension': [1, { extensions: ['.jsx', '.tsx'] }],
-    'react/jsx-first-prop-new-line': ['warn', 'never'],
-    'react/jsx-indent-props': ['error', 'first'],
     'react/jsx-no-useless-fragment': ['error', { allowExpressions: true }],
-    'react/jsx-one-expression-per-line': 'off',
     'react/jsx-props-no-spreading': 'off',
     'react/prefer-es6-class': 'off',
     'react/prefer-stateless-function': 'warn',
@@ -162,13 +156,13 @@ module.exports = {
       },
       {
         blankLine: 'always',
-        prev: ['block', 'multiline-block-like', 'cjs-export', 'class', 'multiline-expression'],
+        prev: ['block', 'cjs-export', 'class'],
         next: '*',
       },
       {
         blankLine: 'always',
         prev: '*',
-        next: ['block', 'multiline-block-like', 'class', 'multiline-expression', 'return'],
+        next: ['block', 'class', 'return'],
       },
     ],
   },

graylog2-web-interface/packages/eslint-config-graylog/package.json

@@ -19,6 +19,7 @@
     "@typescript-eslint/parser": "8.12.2",
     "eslint": "8.57.0",
     "eslint-config-airbnb": "19.0.4",
+    "eslint-config-prettier": "9.1.0",
     "eslint-import-resolver-webpack": "0.13.9",
     "eslint-plugin-compat": "4.2.0",
     "eslint-plugin-graylog": "file:../eslint-plugin-graylog",