@cabify/eslint-config 3.0.1-beta-7 → 3.0.1-beta-10

package/configs/base.js

@@ -17,10 +17,13 @@ import reactA11y from './react-a11y.js';
 import storybook from './storybook.js';
 import strict from './strict.js';
 import style from './style.js';
-import ts from './ts.js';
 import variables from './variables.js';
 
 const isTSAvailable = await isPackageAvailable('typescript');
+let tsConfigs = [];
+if (isTSAvailable) {
+  tsConfigs = await import('./ts.js');
+}
 const isJestAvailable = await isPackageAvailable('jest');
 
 const configs = [
@@ -41,10 +44,6 @@ const configs = [
 ].filter(Boolean);
 
 const overrides = [
-  isTSAvailable && {
-    files: ['**/*.ts', '**/*.tsx'],
-    ...ts,
-  },
   {
     files: ['*.story.tsx', '*.stories.tsx'],
     ...storybook,
@@ -71,5 +70,6 @@ export default [
       strict: 'error',
     },
   },
+  ...tsConfigs,
   ...overrides,
 ];

package/configs/es6.js

@@ -1,18 +1,20 @@
+import globals from 'globals';
+
 export default {
   name: 'ES6-cabify-eslint-config',
-  // languageOptions: {
-  //   globals: {
-  //     es6: true,
-  //   },
-  //   ecmaVersion: 6,
-  //   sourceType: 'module',
-  //   parserOptions: {
-  //     ecmaFeatures: {
-  //       generators: false,
-  //       objectLiteralDuplicateProperties: false,
-  //     },
-  //   },
-  // },
+  languageOptions: {
+    ecmaVersion: 6,
+    sourceType: 'module',
+    globals: {
+      ...globals.es2015,
+    },
+    parserOptions: {
+      ecmaFeatures: {
+        generators: false,
+        objectLiteralDuplicateProperties: false,
+      },
+    },
+  },
 
   rules: {
     // verify super() callings in constructors

package/configs/imports.js

@@ -1,13 +1,14 @@
 import importPlugin from 'eslint-plugin-import';
 import simpleImportSort from 'eslint-plugin-simple-import-sort';
+import globals from 'globals';
 
 export default {
   name: 'imports-cabify-eslint-config',
-  // languageOptions: {
-  //   globals: {
-  //     es6: true,
-  //   },
-  // },
+  languageOptions: {
+    globals: {
+      ...globals.es2015,
+    },
+  },
   plugins: {
     import: importPlugin,
     'simple-import-sort': simpleImportSort,

package/configs/react-a11y.js

@@ -3,15 +3,13 @@ import jsxAllyPlugin from 'eslint-plugin-jsx-a11y';
 export default {
   name: 'react-a11y-cabify-eslint-config',
   plugins: { 'jsx-a11y': jsxAllyPlugin },
-
-  // languageOptions: {
-  //   parserOptions: {
-  //     ecmaFeatures: {
-  //       jsx: true,
-  //     },
-  //   },
-  // },
-
+  languageOptions: {
+    parserOptions: {
+      ecmaFeatures: {
+        jsx: true,
+      },
+    },
+  },
   rules: {
     // Enforce that anchors have content
     // https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/anchor-has-content.md

package/configs/ts.js

@@ -1,9 +1,10 @@
-// eslint-disable-next-line import/no-unresolved
+/* eslint-disable import/no-unresolved */
+/* eslint-disable no-param-reassign */
 import tseslint from 'typescript-eslint';
 
-export default {
+const tsCustomConfig = {
   name: 'ts-cabify-eslint-config',
-  ...tseslint.configs.recommended,
+  files: ['**/*.ts', '**/*.tsx'],
   rules: {
     '@typescript-eslint/restrict-template-expressions': [
       'error',
@@ -135,9 +136,26 @@ export default {
     'no-redeclare': 'off', // superseeded by @typescript-eslint/no-redeclare
     'no-shadow': 'off', // superseeded by @typescript-eslint/no-shadow
   },
-  overrides: [
-    {
-      excludedFiles: '*.d.ts',
+  languageOptions: {
+    parserOptions: {
+      projectService: true,
+      tsconfigRootDir: import.meta.dirname,
     },
-  ],
+  },
+  ignores: ['*.d.ts'],
 };
+
+const tsLintConfig = tseslint.config(
+  ...tseslint.configs.recommended,
+  ...tseslint.configs.recommendedTypeChecked,
+  { ...tsCustomConfig },
+);
+
+if (tsLintConfig.length) {
+  tsLintConfig.forEach((tsconfig) => {
+    tsconfig.files = ['**/*.ts', '**/*.tsx'];
+    tsconfig.ignores = ['**/*.d.ts'];
+  });
+}
+
+export default tsLintConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabify/eslint-config",
-  "version": "3.0.1-beta-7",
+  "version": "3.0.1-beta-10",
   "description": "ESLint config for Cabify Javascript projects",
   "type": "module",
   "scripts": {
@@ -39,7 +39,6 @@
     ".": "./recommended.js"
   },
   "dependencies": {
-    "@typescript-eslint/eslint-plugin": "^8.4.0",
     "@typescript-eslint/parser": "^8.4.0",
     "confusing-browser-globals": "^1.0.10",
     "eslint-config-prettier": "^9.1.0",
@@ -55,15 +54,12 @@
     "typescript-eslint": "^8.8.0"
   },
   "peerDependencies": {
-    "eslint": "9.11.0",
+    "eslint": ">= 9.11.0",
     "prettier": ">= 2.2.1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.11.1",
-    "@types/eslint__js": "^8.42.3",
     "eslint": "^9.11.1",
-    "prettier": "3.3.3",
-    "typescript": "^5.6.2"
+    "prettier": "3.3.3"
   },
   "publishConfig": {
     "access": "public"

package/utils.js

@@ -1,11 +1,13 @@
-/* eslint-disable no-unused-vars */
 // eslint-disable-next-line import/prefer-default-export
 export async function isPackageAvailable(packageName) {
   try {
     // Dynamically import the package
     await import(packageName);
+    console.log(`Package ${packageName} is available`);
     return true;
-  } catch (_) {
+  } catch (error) {
+    console.log(error);
+    console.log(`Package ${packageName} is not available`);
     return false;
   }
 }