eslint fixes

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",

src/dotcom/index.ts

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

src/dotcom/requests.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/server/bandit/banditSelection.test.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/factories/bannerDesign.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/bannerVariant.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/epicVariant.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',

src/server/factories/index.ts

@@ -1,9 +1,9 @@
 import { register } from 'fishery';
+import bannerDesign from './bannerDesign';
+import bannerVariant from './bannerVariant';
+import epicVariant from './epicVariant';
 import targeting from './targeting';
 import test from './test';
-import epicVariant from './epicVariant';
-import bannerVariant from './bannerVariant';
-import bannerDesign from './bannerDesign';
 
 export const factories = register({
     targeting,

src/server/factories/targeting.ts

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

src/server/factories/test.ts

@@ -1,5 +1,5 @@
-import { EpicTest } from '../../shared/types';
 import { Factory } from 'fishery';
+import type { EpicTest } from '../../shared/types';
 
 export default Factory.define<EpicTest>(({ factories }) => ({
     channel: 'Epic',

src/server/lib/ab.test.ts

@@ -1,5 +1,5 @@
-import { EpicTest } from '../../shared/types';
-import { selectVariantUsingMVT, withinRange, selectWithSeed, selectVariant } from './ab';
+import type { EpicTest } from '../../shared/types';
+import { selectVariant, selectVariantUsingMVT, selectWithSeed, withinRange } from './ab';
 
 const test: EpicTest = {
     channel: 'Epic',
@@ -119,7 +119,7 @@ describe('withinRange', () => {
 
 describe('selectWithSeed', () => {
     it('should evenly distribute to the variants', () => {
-        const variantCounts: { [key: string]: number } = {
+        const variantCounts: Record<string, number> = {
             control: 0,
             v1: 0,
         };

src/server/lib/history.test.ts

@@ -1,11 +1,11 @@
+import type { ArticlesViewedSettings } from '../../shared/types';
 import {
     getArticleViewCountByMultipleTagForWeeks,
     getArticleViewCountForWeeks,
     getArticleViewCounts,
     getWeeksInWindow,
     historyWithinArticlesViewedSettings,
 } from './history';
-import { ArticlesViewedSettings } from '../../shared/types';
 
 describe('getArticleViewCountForWeeks', () => {
     // Pass the current date into the tested function so the checks can be made

src/server/lib/targetingTesting.test.ts

@@ -1,7 +1,8 @@
-import { selectTargetingTest, TargetingTest } from './targetingTesting';
-import { BannerTargeting } from '../../shared/types';
+import type { BannerTargeting } from '../../shared/types';
+import type { TargetingTest } from './targetingTesting';
+import { selectTargetingTest } from './targetingTesting';
 
-const bannerTargetingTests: TargetingTest<BannerTargeting>[] = [
+const bannerTargetingTests: Array<TargetingTest<BannerTargeting>> = [
     {
         channel: 'Banner1',
         name: 'BannerTargetingTest',

src/server/roulette/rouletteSelection.test.ts

@@ -1,6 +1,6 @@
+import type { EpicTest } from '../../shared/types';
+import type { BanditData } from '../bandit/banditData';
 import { selectVariantUsingRoulette } from './rouletteSelection';
-import { EpicTest } from '../../shared/types';
-import { BanditData } from '../bandit/banditData';
 
 const epicTest: EpicTest = {
     channel: 'Epic',

src/server/signin-gate/lib.test.ts

@@ -1,13 +1,13 @@
 import {
-    guDefaultShouldShowTheGate,
+    buildAuxiaProxyGetTreatmentsResponseData,
     buildGetTreatmentsRequestPayload,
-    guGateAsAnAuxiaAPIUserTreatment,
+    buildLogTreatmentInteractionRequestPayload,
     guDefaultGateGetTreatmentsResponseData,
+    guDefaultShouldShowTheGate,
+    guGateAsAnAuxiaAPIUserTreatment,
     isValidContentType,
     isValidSection,
     isValidTagIdCollection,
-    buildAuxiaProxyGetTreatmentsResponseData,
-    buildLogTreatmentInteractionRequestPayload,
 } from './lib';
 
 describe('guDefaultShouldShowTheGate', () => {

src/server/tests/amp/ampEpicSelection.test.ts

@@ -1,8 +1,9 @@
-import { TickerCountType, TickerEndType, TickerSettings } from '../../../shared/types';
-import { AmpVariantAssignments } from '../../lib/ampVariantAssignments';
-import { AMPEpic, AmpEpicTest } from './ampEpicModels';
-import { selectAmpEpic } from './ampEpicSelection';
+import type { TickerSettings } from '../../../shared/types';
+import { TickerCountType, TickerEndType } from '../../../shared/types';
+import type { AmpVariantAssignments } from '../../lib/ampVariantAssignments';
 import { TickerDataProvider } from '../../lib/fetchTickerData';
+import type { AMPEpic, AmpEpicTest } from './ampEpicModels';
+import { selectAmpEpic } from './ampEpicSelection';
 
 const tickerSettings: TickerSettings = {
     endType: TickerEndType.unlimited,

src/server/tests/banners/bannerSelection.test.ts

@@ -1,7 +1,7 @@
-import { BannerTargeting, BannerTest } from '../../../shared/types';
+import type { BannerTargeting, BannerTest } from '../../../shared/types';
+import type { BanditData } from '../../bandit/banditData';
 import { BannerDeployTimesProvider } from './bannerDeployTimes';
 import { canShowBannerAgain, selectBannerTest } from './bannerSelection';
-import { BanditData } from '../../bandit/banditData';
 
 const getBannerDeployTimesReloader = (date: string) =>
     new BannerDeployTimesProvider({

src/server/tests/banners/channelBannerTests.test.ts

@@ -1,6 +1,7 @@
-import { getDesignForVariant } from './channelBannerTests';
+import type { BannerDesignFromTool} from '../../../shared/types';
+import { BannerTemplate } from '../../../shared/types';
 import { factories } from '../../factories/';
-import { BannerDesignFromTool, BannerTemplate } from '../../../shared/types';
+import { getDesignForVariant } from './channelBannerTests';
 
 describe('getDesignForVariant', () => {
     it('returns undefined if the variant specifies a template', () => {

src/server/tests/epics/epicSelection.test.ts

@@ -1,26 +1,27 @@
-import {
+import type {
     ArticlesViewedSettings,
     DeviceType,
     EpicTargeting,
     EpicTest,
     EpicVariant,
-    SecondaryCtaType,
-    UserDeviceType,
+    UserDeviceType} from '../../../shared/types';
+import {
+    SecondaryCtaType
 } from '../../../shared/types';
-import { SuperModeArticle } from '../../lib/superMode';
+import type { BanditData } from '../../bandit/banditData';
+import type { SuperModeArticle } from '../../lib/superMode';
 import {
     correctSignedInStatusFilter,
     deviceTypeMatchesFilter,
     findTestAndVariant,
     getUserCohorts,
     hasCountryCode,
     inCorrectCohort,
-    isNotExpired,
     isCountryTargetedForEpic,
+    isNotExpired,
     withinArticleViewedSettings,
     withinMaxViews,
 } from './epicSelection';
-import { BanditData } from '../../bandit/banditData';
 
 const variantDefault: EpicVariant = {
     name: 'control-example-1',

src/server/tests/epics/epicTests.test.ts

@@ -1,4 +1,4 @@
-import { EpicVariant } from '../../../shared/types';
+import type { EpicVariant } from '../../../shared/types';
 import { variantHasArticleCountCopy } from './epicTests';
 
 const baseVariant: EpicVariant = {

src/server/tests/epics/momentumTest.test.ts

@@ -1,4 +1,4 @@
-import { EpicTargeting, EpicTest } from '../../../shared/types';
+import type { EpicTargeting, EpicTest } from '../../../shared/types';
 import {
     getCategoriesForThreeMonths,
     getThreeMonthsHistory,

src/server/tests/gutters/gutterSelection.test.ts

@@ -1,4 +1,4 @@
-import {
+import type {
     GutterTargeting,
     GutterTest,
     GutterTestSelection,

src/server/tests/headers/headerSelection.test.ts

@@ -1,4 +1,4 @@
-import {
+import type {
     HeaderTargeting,
     HeaderTest,
     HeaderTestSelection,

src/server/utils/removeNullValues.test.ts

@@ -1,4 +1,5 @@
 import { removeNullValues } from './removeNullValues';
+
 const test = {
     falsyObjects: {
         undefinedField: undefined,

src/server/utils/withNowAs.ts

@@ -2,7 +2,7 @@
 // tests include async code so really it is not very robust.
 export const withNowAs = <T>(now: Date, fn: () => T): T => {
     const old = Date.now;
-    // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+     
     Date.now = () => now.valueOf(); // override
     const got = fn();
     Date.now = old;

src/shared/lib/geolocation.test.ts

@@ -1,4 +1,4 @@
-import { getCountryName, getLocalCurrencySymbol, addRegionIdToSupportUrl } from './geolocation';
+import { addRegionIdToSupportUrl, getCountryName, getLocalCurrencySymbol } from './geolocation';
 
 describe('getLocalCurrencySymbol', () => {
     const currencySymbolTests = [

src/shared/lib/placeholders.test.ts

@@ -1,10 +1,10 @@
+import type { Prices } from '../types';
 import {
     containsNonArticleCountPlaceholder,
     getDate,
     getDayOfWeek,
     replaceNonArticleCountPlaceholders,
 } from './placeholders';
-import { Prices } from '../types';
 
 describe('containsNonArticleCountPlaceholder', () => {
     it('returns true if string contains placeholder (that is not %%ARTICLE_COUNT%%)', () => {