Merge pull request #1317 from guardian/tf-lint-fixes

eslint fixes

Author: sookburt

cdk/package.json

@@ -7,7 +7,7 @@
     "test": "jest",
     "test-update": "jest -u",
     "format": "prettier --write \"{lib,bin}/**/*.ts\"",
-    "lint": "eslint lib/** bin/** --ext .ts --no-error-on-unmatched-pattern",
+    "lint": "eslint lib/** bin/** --no-error-on-unmatched-pattern",
     "synth": "cdk synth --path-metadata false --version-reporting false",
     "diff": "cdk diff --path-metadata false --version-reporting false"
   },

eslint.config.mjs

@@ -1,38 +1,48 @@
 import guardian from '@guardian/eslint-config';
+import globals from 'globals';
 
 export default [
 	{
 		ignores: [
 			'node_modules',
 			'dist',
+            'server-dist',
 
-			'customize.js',
 			'rollup.config.js',
 			'webpack.*js',
+            'cdk',
 		],
 	},
 	...guardian.configs.recommended,
 	...guardian.configs.jest,
 	{
+        ignores: ['eslint.config.mjs'],
+        languageOptions: {
+            globals: {
+                ...globals.jest,
+                ...globals.browser,
+                ...globals.node,
+            },
+            ecmaVersion: 5,
+            sourceType: 'commonjs',
+            parserOptions: {
+                project: ['./tsconfig.json'],
+                tsconfigRootDir: './',
+            },
+        },
 		rules: {
 			// Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
 			// e.g. "@typescript-eslint/explicit-function-return-type": "off",
 			curly: 2,
-			'@typescript-eslint/no-inferrable-types': [
-				'error',
-				{
-					ignoreParameters: true,
-				},
-			],
-			'@typescript-eslint/no-unused-vars': [
-				'error',
-				{
-					args: 'after-used',
-					ignoreRestSiblings: true,
-				},
-			],
+			// '@typescript-eslint/no-unused-vars': [
+			// 	'error',
+			// 	{
+			// 		args: 'after-used',
+			// 		ignoreRestSiblings: true,
+			// 	},
+			// ],
 
-			// potentially to fix later see https://trello.com/c/lc8lG7Zj 
+			// potentially to fix later see https://trello.com/c/lc8lG7Zj
 			'@typescript-eslint/naming-convention': 'off',
 			'@eslint-community/eslint-comments/require-description': 'off',
 			'@typescript-eslint/ban-types': 'off',
@@ -44,7 +54,6 @@ export default [
 			'@typescript-eslint/require-await': 'off',
 			'@typescript-eslint/no-unsafe-enum-comparison': 'off',
 			'@typescript-eslint/no-unsafe-argument': 'off',
-			'@typescript-eslint/no-unnecessary-condition': 'off',
 			'@typescript-eslint/no-unsafe-return': 'off',
 			'@typescript-eslint/no-base-to-string': 'off',
 			'@typescript-eslint/prefer-promise-reject-errors': 'off',
@@ -53,6 +62,8 @@ export default [
 			'@typescript-eslint/no-unused-vars': 'off',
 			'@typescript-eslint/restrict-template-expressions': 'off',
 			'@typescript-eslint/no-floating-promises': 'off',
+            '@typescript-eslint/prefer-optional-chain': 'off',
+            '@typescript-eslint/await-thenable': 'off',
 		},
 	},
-];
+];

package.json

@@ -21,7 +21,7 @@
         "build-dotcom-types": "tsc --project tsconfig.types.json",
         "publish-dry-run": "pnpm publish --dry-run",
         "publish": "pnpm publish",
-        "lint": "eslint 'src/**/*.{ts,tsx}'",
+        "lint": "eslint .",
         "test": "export stage=DEV; jest",
         "riffraff": "node-riffraff-artifact"
     },
@@ -52,6 +52,7 @@
         "eslint-plugin-prettier": "5.1.3",
         "eslint-plugin-react": "^7.33.2",
         "fishery": "^0.3.0",
+        "globals": "15.14.0",
         "inquirer": "^7.0.3",
         "jest": "^29.7.0",
         "nodemon": "^3.1.7",

pnpm-lock.yaml

@@ -1,4 +1,3 @@
-export { getEpicViewLog, logEpicView } from '../shared/lib/viewLog';
 export { getWeeklyArticleHistory, incrementWeeklyArticleCount } from '../shared/lib/history';
 export {
     replaceNonArticleCountPlaceholders,

src/dotcom/index.ts

@@ -1,15 +1,14 @@
-import {
+import type {
     BannerPayload,
     BannerProps,
     EpicPayload,
     EpicProps,
-    HeaderPayload,
-    HeaderProps,
     GutterPayload,
     GutterProps,
+    HeaderPayload,
+    HeaderProps,
 } from '../shared/types';
-
-import { TestTracking } from '../shared/types/abTests/shared';
+import type { TestTracking } from '../shared/types/abTests/shared';
 
 export interface ModuleData<PROPS> {
     name: string;

src/dotcom/requests.ts

@@ -1,5 +1,5 @@
-import { EpicTest } from '../../shared/types';
-import { BanditData } from './banditData';
+import type { EpicTest } from '../../shared/types';
+import type { BanditData } from './banditData';
 import { selectVariantWithHighestMean } from './banditSelection';
 
 const epicTest: EpicTest = {

src/server/bandit/banditSelection.test.ts

@@ -1,5 +1,5 @@
-import { BannerDesignFromTool, HexColour } from '../../shared/types';
 import { Factory } from 'fishery';
+import type { BannerDesignFromTool, HexColour } from '../../shared/types';
 
 const hexColourStringRegex = /^([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})$/i;
 const stringToHexColour = (colourString: string): HexColour => {

src/server/factories/bannerDesign.ts

@@ -1,5 +1,5 @@
-import { BannerVariant } from '../../shared/types';
 import { Factory } from 'fishery';
+import type { BannerVariant } from '../../shared/types';
 
 export default Factory.define<BannerVariant>(() => ({
     name: 'Example Banner Variant',

src/server/factories/bannerVariant.ts

@@ -1,5 +1,5 @@
-import { EpicVariant } from '../../shared/types';
 import { Factory } from 'fishery';
+import type { EpicVariant } from '../../shared/types';
 
 export default Factory.define<EpicVariant>(() => ({
     name: 'Example Variant',