Merge branch 'master' into mf/nx-cleanup

Turfjs · Aug 8, 2024 · e534ee6 · e534ee6
2 parents e488e90 + 25917d8
commit e534ee6
Show file tree

Hide file tree

Showing 233 changed files with 14,798 additions and 54,940 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 pnpm lint-staged
diff --git a/.monorepolint.config.mjs b/.monorepolint.config.mjs
@@ -250,5 +250,14 @@ export default {
       },
       includePackages: [MAIN_PACKAGE],
     }),
+
+    requireDependency({
+      options: {
+        dependencies: {
+          "@types/geojson": "^7946.0.0",
+        },
+      },
+      includePackages: [MAIN_PACKAGE, ...TS_PACKAGES, ...JS_PACKAGES],
+    }),
   ],
 };
diff --git a/.prettierignore b/.prettierignore
@@ -1,23 +1,10 @@
 dist
 *.md
 node_modules
-tsconfig.json
-lerna.json
-
-# slow
-packages/turf-directional-mean/test/in/bus_route_gps.json
-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/**
-
 pnpm-lock.yaml
 
-/.nx/cache
+/.nx/cache
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -1,3 +1,11 @@
 {
-  "trailingComma": "es5"
+  "trailingComma": "es5",
+  "overrides": [
+    {
+      "files": "*.{geojson,json}",
+      "options": {
+        "printWidth": 90
+      }
+    }
+  ]
 }
diff --git a/package.json b/package.json
@@ -12,29 +12,27 @@
     "lint:mrl": "mrl check",
     "lint:prettier": "prettier --check .",
     "preinstall": "npx only-allow pnpm",
-    "prepare": "lerna run build && husky install",
+    "prepare": "husky && lerna run build",
     "test": "pnpm run lint && lerna run test && lerna run --scope @turf/turf last-checks"
   },
   "lint-staged": {
     "package.json": [
       "mrl check --paths"
     ],
     "**/*.{js,ts}": [
-      "eslint --fix",
-      "prettier --write"
+      "eslint --fix"
     ],
     "packages/*/index.{js,ts}": [
       "pnpm tsx ./scripts/generate-readmes"
     ],
-    "**/*": "prettier --write --ignore-unknown"
+    "*": "prettier --write --ignore-unknown"
   },
   "packageManager": "[email protected]+sha512.d1a029e1a447ad90bc96cd58b0fad486d2993d531856396f7babf2d83eb1823bb83c5a3d0fc18f675b2d10321d49eb161fece36fe8134aa5823ecd215feed392",
   "devDependencies": {
     "@monorepolint/cli": "0.5.0-alpha.132",
     "@monorepolint/config": "0.5.0-alpha.132",
     "@monorepolint/core": "0.5.0-alpha.132",
     "@monorepolint/rules": "0.5.0-alpha.132",
-    "@types/geojson": "7946.0.8",
     "@types/node": "18.11.9",
     "@typescript-eslint/eslint-plugin": "^6.10.0",
     "@typescript-eslint/parser": "^6.10.0",
@@ -51,13 +49,13 @@
     "esm": "^3.2.25",
     "fs-extra": "^11.1.1",
     "glob": "^10.3.10",
-    "husky": "^8.0.0",
+    "husky": "^9.0.0",
     "lerna": "^8.1.7",
-    "lint-staged": "^10.5.4",
+    "lint-staged": "^15.2.8",
     "load-json-file": "^7.0.1",
     "meow": "^12.1.1",
     "npm-run-all": "^4.1.5",
-    "prettier": "^3.0.3",
+    "prettier": "^3.3.3",
     "progress": "^2.0.3",
     "ts-node": "^9.0.0",
     "tsup": "^8.0.1",

diff --git a/packages/turf-along/package.json b/packages/turf-along/package.json
@@ -68,6 +68,7 @@
     "@turf/distance": "workspace:^",
     "@turf/helpers": "workspace:^",
     "@turf/invariant": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-angle/package.json b/packages/turf-angle/package.json
@@ -72,6 +72,7 @@
     "@turf/helpers": "workspace:^",
     "@turf/invariant": "workspace:^",
     "@turf/rhumb-bearing": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-area/package.json b/packages/turf-area/package.json
@@ -65,6 +65,7 @@
   "dependencies": {
     "@turf/helpers": "workspace:^",
     "@turf/meta": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-bbox-clip/package.json b/packages/turf-bbox-clip/package.json
@@ -72,6 +72,7 @@
   "dependencies": {
     "@turf/helpers": "workspace:^",
     "@turf/invariant": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-bbox-polygon/package.json b/packages/turf-bbox-polygon/package.json
@@ -63,6 +63,7 @@
   },
   "dependencies": {
     "@turf/helpers": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-bbox/package.json b/packages/turf-bbox/package.json
@@ -65,6 +65,7 @@
   "dependencies": {
     "@turf/helpers": "workspace:^",
     "@turf/meta": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-bearing/package.json b/packages/turf-bearing/package.json
@@ -63,6 +63,7 @@
   "dependencies": {
     "@turf/helpers": "workspace:^",
     "@turf/invariant": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-bezier-spline/package.json b/packages/turf-bezier-spline/package.json
@@ -66,6 +66,7 @@
   "dependencies": {
     "@turf/helpers": "workspace:^",
     "@turf/invariant": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-boolean-clockwise/package.json b/packages/turf-boolean-clockwise/package.json
@@ -70,6 +70,7 @@
   "dependencies": {
     "@turf/helpers": "workspace:^",
     "@turf/invariant": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-boolean-concave/package.json b/packages/turf-boolean-concave/package.json
@@ -69,6 +69,7 @@
   "dependencies": {
     "@turf/helpers": "workspace:^",
     "@turf/invariant": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-boolean-contains/package.json b/packages/turf-boolean-contains/package.json
@@ -74,6 +74,7 @@
     "@turf/boolean-point-on-line": "workspace:^",
     "@turf/helpers": "workspace:^",
     "@turf/invariant": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-boolean-crosses/package.json b/packages/turf-boolean-crosses/package.json
@@ -73,6 +73,7 @@
     "@turf/invariant": "workspace:^",
     "@turf/line-intersect": "workspace:^",
     "@turf/polygon-to-line": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-boolean-disjoint/package.json b/packages/turf-boolean-disjoint/package.json
@@ -72,6 +72,7 @@
     "@turf/line-intersect": "workspace:^",
     "@turf/meta": "workspace:^",
     "@turf/polygon-to-line": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-boolean-disjoint/test/false/Polygon/Polygon/issue-1216.geojson b/packages/turf-boolean-disjoint/test/false/Polygon/Polygon/issue-1216.geojson
@@ -17,10 +17,7 @@
         ]
       },
       "bbox": [
-        6.632039186485088,
-        46.513552354874435,
-        6.638240782825051,
-        46.52452567471025
+        6.632039186485088, 46.513552354874435, 6.638240782825051, 46.52452567471025
       ]
     },
     {
@@ -38,12 +35,7 @@
           ]
         ]
       },
-      "bbox": [
-        6.626132904233913,
-        46.51709747623775,
-        6.645459572232596,
-        46.52102619404951
-      ]
+      "bbox": [6.626132904233913, 46.51709747623775, 6.645459572232596, 46.52102619404951]
     }
   ]
 }
diff --git a/packages/turf-boolean-equal/package.json b/packages/turf-boolean-equal/package.json
@@ -74,6 +74,7 @@
     "@turf/clean-coords": "workspace:^",
     "@turf/helpers": "workspace:^",
     "@turf/invariant": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "geojson-equality-ts": "^1.0.2",
     "tslib": "^2.6.2"
   }

diff --git a/packages/turf-boolean-intersects/package.json b/packages/turf-boolean-intersects/package.json
@@ -71,6 +71,7 @@
     "@turf/boolean-disjoint": "workspace:^",
     "@turf/helpers": "workspace:^",
     "@turf/meta": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-boolean-intersects/test/true/Polygon/Polygon/issue-1216.geojson b/packages/turf-boolean-intersects/test/true/Polygon/Polygon/issue-1216.geojson
@@ -17,10 +17,7 @@
         ]
       },
       "bbox": [
-        6.632039186485088,
-        46.513552354874435,
-        6.638240782825051,
-        46.52452567471025
+        6.632039186485088, 46.513552354874435, 6.638240782825051, 46.52452567471025
       ]
     },
     {
@@ -38,12 +35,7 @@
           ]
         ]
       },
-      "bbox": [
-        6.626132904233913,
-        46.51709747623775,
-        6.645459572232596,
-        46.52102619404951
-      ]
+      "bbox": [6.626132904233913, 46.51709747623775, 6.645459572232596, 46.52102619404951]
     }
   ]
 }
diff --git a/packages/turf-boolean-overlap/package.json b/packages/turf-boolean-overlap/package.json
@@ -75,6 +75,7 @@
     "@turf/line-intersect": "workspace:^",
     "@turf/line-overlap": "workspace:^",
     "@turf/meta": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "geojson-equality-ts": "^1.0.2",
     "tslib": "^2.6.2"
   }

diff --git a/packages/turf-boolean-parallel/package.json b/packages/turf-boolean-parallel/package.json
@@ -70,6 +70,7 @@
     "@turf/helpers": "workspace:^",
     "@turf/line-segment": "workspace:^",
     "@turf/rhumb-bearing": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-boolean-point-in-polygon/package.json b/packages/turf-boolean-point-in-polygon/package.json
@@ -65,6 +65,7 @@
   "dependencies": {
     "@turf/helpers": "workspace:^",
     "@turf/invariant": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "point-in-polygon-hao": "^1.1.0",
     "tslib": "^2.6.2"
   }

diff --git a/packages/turf-boolean-point-in-polygon/test/in/multipoly-with-hole.geojson b/packages/turf-boolean-point-in-polygon/test/in/multipoly-with-hole.geojson
@@ -1,12 +1,7 @@
 {
   "type": "Feature",
   "properties": {},
-  "bbox": [
-    -86.77362442016602,
-    36.170862616662134,
-    -86.67303085327148,
-    36.23084281427824
-  ],
+  "bbox": [-86.77362442016602, 36.170862616662134, -86.67303085327148, 36.23084281427824],
   "geometry": {
     "type": "MultiPolygon",
     "coordinates": [

diff --git a/packages/turf-boolean-point-in-polygon/test/in/poly-with-hole.geojson b/packages/turf-boolean-point-in-polygon/test/in/poly-with-hole.geojson
@@ -1,12 +1,7 @@
 {
   "type": "Feature",
   "properties": {},
-  "bbox": [
-    -86.73980712890625,
-    36.173495506147,
-    -86.67303085327148,
-    36.23084281427824
-  ],
+  "bbox": [-86.73980712890625, 36.173495506147, -86.67303085327148, 36.23084281427824],
   "geometry": {
     "type": "Polygon",
     "coordinates": [

diff --git a/packages/turf-boolean-point-on-line/package.json b/packages/turf-boolean-point-on-line/package.json
@@ -67,6 +67,7 @@
   "dependencies": {
     "@turf/helpers": "workspace:^",
     "@turf/invariant": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-boolean-touches/package.json b/packages/turf-boolean-touches/package.json
@@ -75,6 +75,7 @@
     "@turf/boolean-point-on-line": "workspace:^",
     "@turf/helpers": "workspace:^",
     "@turf/invariant": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-boolean-valid/package.json b/packages/turf-boolean-valid/package.json
@@ -78,6 +78,7 @@
     "@turf/helpers": "workspace:^",
     "@turf/invariant": "workspace:^",
     "@turf/line-intersect": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "geojson-polygon-self-intersections": "^1.2.1",
     "tslib": "^2.6.2"
   }

diff --git a/packages/turf-boolean-valid/test/false/MultiPoint/multipoint.geojson b/packages/turf-boolean-valid/test/false/MultiPoint/multipoint.geojson
@@ -6,10 +6,7 @@
       "properties": {},
       "geometry": {
         "type": "MultiPoint",
-        "coordinates": [
-          [2.7575683593749996],
-          [2.5575683593749996, 2.8113711933311403]
-        ]
+        "coordinates": [[2.7575683593749996], [2.5575683593749996, 2.8113711933311403]]
       }
     }
   ]

diff --git a/packages/turf-boolean-within/package.json b/packages/turf-boolean-within/package.json
@@ -76,6 +76,7 @@
     "@turf/boolean-point-on-line": "workspace:^",
     "@turf/helpers": "workspace:^",
     "@turf/invariant": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }
diff --git a/packages/turf-buffer/package.json b/packages/turf-buffer/package.json
@@ -78,6 +78,7 @@
     "@turf/jsts": "^2.7.1",
     "@turf/meta": "workspace:^",
     "@turf/projection": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "d3-geo": "1.7.1"
   }
 }
diff --git a/packages/turf-center-mean/package.json b/packages/turf-center-mean/package.json
@@ -76,6 +76,7 @@
     "@turf/bbox": "workspace:^",
     "@turf/helpers": "workspace:^",
     "@turf/meta": "workspace:^",
+    "@types/geojson": "^7946.0.0",
     "tslib": "^2.6.2"
   }
 }