Upgrade typescript, prettier, et al to continue to modernise build en…

…vironment (#2519) * Simplify nx config (no point separately caching es and js builds - they both need to be done for any code changes). Fix some no-op type definitions i.e. X extends any, and enforce templated property types as having to extend GeoJsonProperties throughout. * Upgrade typescript. Had to update topojson-* type defs to avoid the P = GeoJsonProperties problem in geojson-rbush. Also fix a couple of floating point precision related issues that eslint now apparently catches! * Retire tslint. * Upgrade eslint and prettier. Add minimal prettier config (defaults have changed) to avoid widespread, minor formatting changes (trailing commas mostly).
Turfjs · Oct 24, 2023 · e5afd5c · e5afd5c
1 parent 14a2ac5
commit e5afd5c
Show file tree

Hide file tree

Showing 126 changed files with 692 additions and 574 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -14,12 +14,12 @@ const rules = {
 module.exports = {
   root: true,
   ignorePatterns: ["**/dist/**"],
+  parser: "@typescript-eslint/parser",
   plugins: ["@typescript-eslint"],
   extends: [
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
-    "prettier",
-    "prettier/@typescript-eslint",
+    "plugin:prettier/recommended",
   ],
   parserOptions: {
     ecmaVersion: 6,

diff --git a/.prettierignore b/.prettierignore
@@ -10,3 +10,10 @@ packages/turf-directional-mean/test/in/bus_route_utm.json
 
 # is actually output
 packages/turf/turf.min.js
+
+# Ignore test fixture json in case intentional line breaks help with coord
+# readability.
+packages/turf-*/test/in/**
+packages/turf-*/test/out/**
+packages/turf-*/test/true/**
+packages/turf-*/test/false/**
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -1 +1,3 @@
-{}
+{
+  "trailingComma": "es5"
+}
diff --git a/examples/browser/index.html b/examples/browser/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />

diff --git a/examples/create-react-app/public/index.html b/examples/create-react-app/public/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />

diff --git a/examples/es-modules-single-module/index.html b/examples/es-modules-single-module/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />

diff --git a/examples/es-modules/index.html b/examples/es-modules/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />

diff --git a/nx.json b/nx.json
@@ -3,17 +3,7 @@
     "default": {
       "runner": "nx/tasks-runners/default",
       "options": {
-        "cacheableOperations": [
-          "build",
-          "build:es",
-          "build:js",
-          "test",
-          "test:tape",
-          "test:types",
-          "last-checks",
-          "last-checks:example",
-          "last-checks:testjs"
-        ]
+        "cacheableOperations": ["build", "test", "last-checks"]
       }
     }
   },
@@ -22,31 +12,11 @@
       "dependsOn": ["^build"],
       "outputs": ["{projectRoot}/dist"]
     },
-    "build:es": {
-      "dependsOn": ["^build:es"],
-      "outputs": ["{projectRoot}/dist"]
-    },
-    "build:js": {
-      "dependsOn": ["^build:js"],
-      "outputs": ["{projectRoot}/dist"]
-    },
     "test": {
       "dependsOn": ["^test"]
     },
-    "test:tape": {
-      "dependsOn": ["^test:tape"]
-    },
-    "test:types": {
-      "dependsOn": ["^test:types"]
-    },
     "last-checks": {
       "dependsOn": ["^last-checks"]
-    },
-    "last-checks:example": {
-      "dependsOn": ["^last-checks:example"]
-    },
-    "last-checks:testjs": {
-      "dependsOn": ["^last-checks:testjs"]
     }
   }
 }
diff --git a/package.json b/package.json
@@ -39,18 +39,19 @@
   },
   "devDependencies": {
     "@types/geojson": "7946.0.8",
-    "@types/node": "^17.0.21",
-    "@typescript-eslint/eslint-plugin": "^4.8.0",
-    "@typescript-eslint/parser": "^4.8.0",
+    "@types/node": "18.11.9",
+    "@typescript-eslint/eslint-plugin": "^6.8.0",
+    "@typescript-eslint/parser": "^6.8.0",
     "acorn": "^7.4.1",
     "camelcase": "*",
     "d3-queue": "*",
     "decamelize": "*",
     "dependency-tree": "^8.1.2",
     "documentation": "^14.0.2",
     "es-check": "^7.1.1",
-    "eslint": "~7.13.0",
-    "eslint-config-prettier": "^6.15.0",
+    "eslint": "^8.51.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.1",
     "esm": "^3.2.25",
     "fs-extra": "*",
     "husky": "^4.2.3",
@@ -60,13 +61,13 @@
     "meow": "*",
     "monorepolint": "^0.5.0-alpha.20",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.1.2",
+    "prettier": "^3.0.3",
     "progress": "*",
     "rollup": "^2.34.2",
     "tape": "^5.7.0",
     "ts-node": "^9.0.0",
     "tsx": "^3.12.8",
-    "typescript": "^3.8.3",
+    "typescript": "^5.2.2",
     "yamljs": "*"
   }
 }
diff --git a/packages/turf-along/package.json b/packages/turf-along/package.json
@@ -53,7 +53,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*"
   },

diff --git a/packages/turf-angle/package.json b/packages/turf-angle/package.json
@@ -57,7 +57,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*",
     "write-json-file": "*"

diff --git a/packages/turf-area/package.json b/packages/turf-area/package.json
@@ -52,7 +52,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*",
     "write-json-file": "*"

diff --git a/packages/turf-bbox-clip/index.ts b/packages/turf-bbox-clip/index.ts
@@ -37,7 +37,7 @@ import { lineclip, polygonclip } from "./lib/lineclip";
  */
 export default function bboxClip<
   G extends Polygon | MultiPolygon | LineString | MultiLineString,
-  P = GeoJsonProperties
+  P extends GeoJsonProperties = GeoJsonProperties,
 >(feature: Feature<G, P> | G, bbox: BBox) {
   const geom = getGeom(feature);
   const type = geom.type;

diff --git a/packages/turf-bbox-clip/package.json b/packages/turf-bbox-clip/package.json
@@ -59,7 +59,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*",
     "write-json-file": "*"

diff --git a/packages/turf-bbox-polygon/index.ts b/packages/turf-bbox-polygon/index.ts
@@ -18,7 +18,9 @@ import { polygon, Id } from "@turf/helpers";
  * //addToMap
  * var addToMap = [poly]
  */
-export default function bboxPolygon<P = GeoJsonProperties>(
+export default function bboxPolygon<
+  P extends GeoJsonProperties = GeoJsonProperties,
+>(
   bbox: BBox,
   options: {
     properties?: P;

diff --git a/packages/turf-bbox-polygon/package.json b/packages/turf-bbox-polygon/package.json
@@ -52,7 +52,6 @@
     "benchmark": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*"
   },

diff --git a/packages/turf-bbox/package.json b/packages/turf-bbox/package.json
@@ -53,7 +53,6 @@
     "benchmark": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*"
   },

diff --git a/packages/turf-bearing/package.json b/packages/turf-bearing/package.json
@@ -50,7 +50,6 @@
     "benchmark": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*",
     "write-json-file": "*"

diff --git a/packages/turf-bezier-spline/index.ts b/packages/turf-bezier-spline/index.ts
@@ -33,7 +33,7 @@ import Spline from "./lib/spline";
  * var addToMap = [line, curved]
  * curved.properties = { stroke: '#0F0' };
  */
-function bezier<P = GeoJsonProperties>(
+function bezier<P extends GeoJsonProperties = GeoJsonProperties>(
   line: Feature<LineString> | LineString,
   options: {
     properties?: P;

diff --git a/packages/turf-bezier-spline/package.json b/packages/turf-bezier-spline/package.json
@@ -53,7 +53,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*",
     "write-json-file": "*"

diff --git a/packages/turf-boolean-clockwise/package.json b/packages/turf-boolean-clockwise/package.json
@@ -58,7 +58,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*"
   },

diff --git a/packages/turf-boolean-concave/package.json b/packages/turf-boolean-concave/package.json
@@ -57,7 +57,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*"
   },

diff --git a/packages/turf-boolean-contains/package.json b/packages/turf-boolean-contains/package.json
@@ -59,7 +59,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*"
   },

diff --git a/packages/turf-boolean-crosses/package.json b/packages/turf-boolean-crosses/package.json
@@ -58,7 +58,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*"
   },

diff --git a/packages/turf-boolean-disjoint/package.json b/packages/turf-boolean-disjoint/package.json
@@ -57,7 +57,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*"
   },

diff --git a/packages/turf-boolean-equal/package.json b/packages/turf-boolean-equal/package.json
@@ -62,7 +62,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*"
   },

diff --git a/packages/turf-boolean-intersects/package.json b/packages/turf-boolean-intersects/package.json
@@ -57,7 +57,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*"
   },

diff --git a/packages/turf-boolean-overlap/package.json b/packages/turf-boolean-overlap/package.json
@@ -61,7 +61,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*"
   },

diff --git a/packages/turf-boolean-parallel/package.json b/packages/turf-boolean-parallel/package.json
@@ -55,7 +55,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*",
     "write-json-file": "*"

diff --git a/packages/turf-boolean-point-in-polygon/index.ts b/packages/turf-boolean-point-in-polygon/index.ts
@@ -38,7 +38,7 @@ import { getCoord, getGeom } from "@turf/invariant";
  */
 export default function booleanPointInPolygon<
   G extends Polygon | MultiPolygon,
-  P = GeoJsonProperties
+  P extends GeoJsonProperties = GeoJsonProperties,
 >(
   point: Coord,
   polygon: Feature<G, P> | G,

diff --git a/packages/turf-boolean-point-in-polygon/package.json b/packages/turf-boolean-point-in-polygon/package.json
@@ -53,7 +53,6 @@
     "benchmark": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*"
   },

diff --git a/packages/turf-boolean-point-on-line/package.json b/packages/turf-boolean-point-on-line/package.json
@@ -54,7 +54,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*",
     "write-json-file": "*"

diff --git a/packages/turf-boolean-touches/package.json b/packages/turf-boolean-touches/package.json
@@ -61,7 +61,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*"
   },

diff --git a/packages/turf-boolean-valid/package.json b/packages/turf-boolean-valid/package.json
@@ -59,7 +59,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*"
   },

diff --git a/packages/turf-boolean-within/package.json b/packages/turf-boolean-within/package.json
@@ -61,7 +61,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*"
   },

diff --git a/packages/turf-center-mean/index.ts b/packages/turf-center-mean/index.ts
@@ -28,7 +28,7 @@ import { isNumber, point, Id } from "@turf/helpers";
  * mean.properties['marker-size'] = 'large';
  * mean.properties['marker-color'] = '#000';
  */
-function centerMean<P = GeoJsonProperties>(
+function centerMean<P extends GeoJsonProperties = GeoJsonProperties>(
   geojson: any, // To-Do include Typescript AllGeoJSON
   options: { properties?: P; bbox?: BBox; id?: Id; weight?: string } = {}
 ): Feature<Point, P> {

diff --git a/packages/turf-center-mean/package.json b/packages/turf-center-mean/package.json
@@ -62,7 +62,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*",
     "write-json-file": "*"

diff --git a/packages/turf-center-median/package.json b/packages/turf-center-median/package.json
@@ -57,7 +57,6 @@
     "load-json-file": "*",
     "npm-run-all": "*",
     "tape": "*",
-    "tslint": "*",
     "tsx": "*",
     "typescript": "*",
     "write-json-file": "*"

diff --git a/packages/turf-center-of-mass/index.ts b/packages/turf-center-of-mass/index.ts
@@ -21,7 +21,7 @@ import { coordEach } from "@turf/meta";
  * //addToMap
  * var addToMap = [polygon, center]
  */
-function centerOfMass<P = GeoJsonProperties>(
+function centerOfMass<P extends GeoJsonProperties = GeoJsonProperties>(
   geojson: any,
   options: {
     properties?: P;