Refactor ESLint configuration to use TypeScript settings and streamli…

…ne config files
CodeForAfrica · Jan 9, 2025 · b492483 · b492483
1 parent 2cbaa81
commit b492483
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 125 deletions.
diff --git a/apps/civicsignalblog/eslint.config.js b/apps/civicsignalblog/eslint.config.js
@@ -1,32 +1,3 @@
-const eslintConfig = require("eslint-config-commons-ui/next");
+const eslintConfig = require("eslint-config-commons-ui/typescript");
 
-module.exports = [
-  {
-    settings: {
-      "import/resolver": {
-        webpack: {
-          config: "eslint.webpack.config.js",
-        },
-        typescript: {
-          alwaysTryTypes: false,
-          project: "./tsconfig.json",
-        },
-      },
-    },
-  },
-  ...eslintConfig,
-  {
-    rules: {
-      "react/jsx-filename-extension": [1, { extensions: [".js", ".tsx"] }], // This rule allows JSX syntax in both .js and tsx files
-      // Disable requirement for importing file extensions for js and tsx files, without this we cant import custom components in Payload
-      "import/extensions": [
-        "error",
-        "ignorePackages",
-        {
-          js: "never",
-          tsx: "never",
-        },
-      ],
-    },
-  },
-];
+module.exports = eslintConfig;
diff --git a/apps/climatemappedafrica/tsconfig.json b/apps/climatemappedafrica/tsconfig.json
@@ -21,7 +21,8 @@
       "@/commons-ui/payload/*": ["../../packages/commons-ui-payload/src/*"],
       "@/hurumap/core/*": ["../../packages/hurumap-core/src/*"],
       "@/hurumap/next/*": ["../../packages/hurumap-next/src/*"]
-    }
+    },
+    "target": "ES2017"
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
   "exclude": ["build", "dist", "node_modules"]

diff --git a/apps/roboshield/eslint.config.js b/apps/roboshield/eslint.config.js
@@ -1,32 +1,3 @@
-const eslintConfig = require("eslint-config-commons-ui/next");
+const eslintConfig = require("eslint-config-commons-ui/typescript");
 
-module.exports = [
-  {
-    settings: {
-      "import/resolver": {
-        webpack: {
-          config: "./eslint.webpack.config.js",
-        },
-        typescript: {
-          alwaysTryTypes: false,
-          project: "./tsconfig.json",
-        },
-      },
-    },
-  },
-  {
-    rules: {
-      "react/jsx-filename-extension": [1, { extensions: [".js", ".tsx"] }], // This rule allows JSX syntax in both .js and tsx files
-      // Disable requirement for importing file extensions for js and tsx files, without this we cant import custom components in Payload
-      "import/extensions": [
-        "error",
-        "ignorePackages",
-        {
-          js: "never",
-          tsx: "never",
-        },
-      ],
-    },
-  },
-  ...eslintConfig,
-];
+module.exports = eslintConfig;
diff --git a/apps/techlabblog/eslint.config.js b/apps/techlabblog/eslint.config.js
@@ -1,32 +1,3 @@
-const eslintConfig = require("eslint-config-commons-ui/next");
+const eslintConfig = require("eslint-config-commons-ui/typescript");
 
-module.exports = [
-  {
-    settings: {
-      "import/resolver": {
-        webpack: {
-          config: "./eslint.webpack.config.js",
-        },
-        typescript: {
-          alwaysTryTypes: false,
-          project: "./tsconfig.json",
-        },
-      },
-    },
-  },
-  ...eslintConfig,
-  {
-    rules: {
-      "react/jsx-filename-extension": [1, { extensions: [".js", ".tsx"] }], // This rule allows JSX syntax in both .js and tsx files
-      // Disable requirement for importing file extensions for js and tsx files, without this we cant import custom components in Payload
-      "import/extensions": [
-        "error",
-        "ignorePackages",
-        {
-          js: "never",
-          tsx: "never",
-        },
-      ],
-    },
-  },
-];
+module.exports = eslintConfig;
diff --git a/apps/vpnmanager/eslint.config.js b/apps/vpnmanager/eslint.config.js
@@ -1,32 +1,3 @@
-const eslintConfig = require("eslint-config-commons-ui/next");
+const eslintConfig = require("eslint-config-commons-ui/typescript");
 
-module.exports = [
-  {
-    settings: {
-      "import/resolver": {
-        webpack: {
-          config: "./eslint.webpack.config.js",
-        },
-        typescript: {
-          alwaysTryTypes: false,
-          project: "./tsconfig.json",
-        },
-      },
-    },
-  },
-  ...eslintConfig,
-  {
-    rules: {
-      "react/jsx-filename-extension": [1, { extensions: [".js", ".tsx"] }], // This rule allows JSX syntax in both .js and tsx files
-      // Disable requirement for importing file extensions for js and tsx files, without this we cant import custom components in Payload
-      "import/extensions": [
-        "error",
-        "ignorePackages",
-        {
-          js: "never",
-          tsx: "never",
-        },
-      ],
-    },
-  },
-];
+module.exports = eslintConfig;
diff --git a/packages/eslint-config-commons-ui/typescript.js b/packages/eslint-config-commons-ui/typescript.js
@@ -0,0 +1,32 @@
+const nextConfig = require("./next");
+
+module.exports = [
+  {
+    settings: {
+      "import/resolver": {
+        webpack: {
+          config: "./eslint.webpack.config.js",
+        },
+        typescript: {
+          alwaysTryTypes: false,
+          project: "./tsconfig.json",
+        },
+      },
+    },
+  },
+  ...nextConfig,
+  {
+    rules: {
+      "react/jsx-filename-extension": [1, { extensions: [".js", ".tsx"] }], // This rule allows JSX syntax in both .js and tsx files
+      // Disable requirement for importing file extensions for js and tsx files, without this we cant import custom components in Payload
+      "import/extensions": [
+        "error",
+        "ignorePackages",
+        {
+          js: "never",
+          tsx: "never",
+        },
+      ],
+    },
+  },
+];