update eslint config

client/src/context.ts

@@ -2,3 +2,4 @@ import { createContext } from 'react';
 import type { Output } from './types';
 
 export const DataContext = createContext(undefined as never as Output);
+DataContext.displayName = 'DataContext';

client/src/pages/LayerInfo.tsx

@@ -146,11 +146,9 @@ export const LayerInfo: React.FC = () => {
                 </td>
                 <td>{type}</td>
                 <td>{stats && formatNumber(total(stats))}</td>
-                {/* eslint-disable-next-line jsx-a11y/control-has-associated-label -- bug with the rule */}
                 <td>
                   <Tags type={type} data={data} />
                 </td>
-                {/* eslint-disable-next-line jsx-a11y/control-has-associated-label -- bug with the rule */}
                 <td>
                   <Tags type={type} data={data} acceptTags />
                 </td>

client/vite.config.ts

@@ -1,4 +1,3 @@
-/* eslint-disable import/no-extraneous-dependencies */
 import react from '@vitejs/plugin-react';
 import { defineConfig } from 'vite';
 

eslint.config.js

@@ -0,0 +1 @@
+export { default } from 'eslint-config-kyle';

package.json

@@ -8,7 +8,7 @@
   ],
   "scripts": {
     "start": "node --import tsx --env-file=.env.local src/main",
-    "lint": "eslint --ext .ts,.tsx,.js --ignore-path .gitignore . && tsc",
+    "lint": "eslint . && tsc",
     "test": "vitest"
   },
   "dependencies": {
@@ -19,25 +19,12 @@
   "devDependencies": {
     "@types/geojson": "^7946.0.14",
     "@types/node": "^20.14.0",
-    "eslint": "^8.56.0",
-    "eslint-config-kyle": "^22.4.0",
+    "eslint": "^9.16.0",
+    "eslint-config-kyle": "^25.0.0",
     "osm-api": "^2.1.1",
     "tsx": "^4.11.2",
     "vitest": "^1.6.0"
   },
-  "eslintConfig": {
-    "extends": "kyle",
-    "rules": {
-      "camelcase": 0,
-      "no-param-reassign": 0,
-      "@typescript-eslint/no-dynamic-delete": 0
-    },
-    "settings": {
-      "jest": {
-        "version": 29
-      }
-    }
-  },
   "prettier": "eslint-config-kyle/prettier",
   "engineStrict": true,
   "engines": {

src/api/config.ts

@@ -1,10 +1,10 @@
 import { promises as fs } from 'node:fs';
-import { project } from '../../taginfo.json' assert { type: 'json' };
+import taginfo from '../../taginfo.json' assert { type: 'json' };
 import { configRawPath } from '../core/constants.js';
 import type { Config } from '../core/types/general.def.js';
 import { parseJsonc } from '../core/jsonc.js';
 
-const url = project.project_url.replace(
+const url = taginfo.project.project_url.replace(
   'github.com',
   'raw.githubusercontent.com/wiki',
 );

src/conflate/applyCustomMerges.ts

@@ -1,4 +1,3 @@
-/* eslint-disable unicorn/prevent-abbreviations -- refs is a common OSM term */
 import { distanceBetween } from '../core/geo.js';
 import type { TransformedNzgb } from '../core/types/nzgb.def.js';
 import type { TransformedOsm } from '../core/types/osm.def.js';

src/conflate/compareFeatures/exceptions.ts

@@ -52,10 +52,12 @@ export function isUnofficialAndOsmHasMacrons(
   osm: OSMFeature,
   config: Config,
 ) {
+  const ref = osm.tags['ref:linz:place_id']!;
+
   // for official names, an inconsistency is only
   // acceptable if there's an override for this ref.
   const shouldAllowInconsistency = nzgb.official
-    ? osm.tags['ref:linz:place_id']! in config.allowInconsistentDiacritics
+    ? ref in config.allowInconsistentDiacritics
     : true;
 
   return (

src/conflate/findBestWikidata.ts

@@ -1,4 +1,3 @@
-/* eslint-disable unicorn/prevent-abbreviations -- refs is a common OSM term */
 import type { NZGBFeature } from '../core/types/nzgb.def.js';
 import type { WikidataItem } from '../core/types/wikidata.def.js';
 

src/transformer/nzgb.ts

@@ -176,7 +176,6 @@ async function tempToFinal(temp: TempObject, config: Config) {
   return out;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 export async function transformNzgb(_: number, config: Config) {
   console.log('Preprocessing NZGB data...');
   const temp = await csvToTemp();