Merge remote-tracking branch 'origin/master' into mf/nx-cleanup

Author: mfedderly

.husky/pre-commit

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 pnpm lint-staged

.monorepolint.config.mjs

@@ -250,5 +250,14 @@ export default {
       },
       includePackages: [MAIN_PACKAGE],
     }),
+
+    requireDependency({
+      options: {
+        dependencies: {
+          "@types/geojson": "^7946.0.10",
+        },
+      },
+      includePackages: [MAIN_PACKAGE, ...TS_PACKAGES, ...JS_PACKAGES],
+    }),
   ],
 };

.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

.prettierrc.json

@@ -1,3 +1,11 @@
 {
-  "trailingComma": "es5"
+  "trailingComma": "es5",
+  "overrides": [
+    {
+      "files": "*.{geojson,json}",
+      "options": {
+        "printWidth": 90
+      }
+    }
+  ]
 }

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

packages/turf-along/package.json

@@ -68,6 +68,7 @@
     "@turf/distance": "workspace:^",
     "@turf/helpers": "workspace:^",
     "@turf/invariant": "workspace:^",
+    "@types/geojson": "^7946.0.10",
     "tslib": "^2.6.2"
   }
 }

packages/turf-angle/package.json

@@ -72,6 +72,7 @@
     "@turf/helpers": "workspace:^",
     "@turf/invariant": "workspace:^",
     "@turf/rhumb-bearing": "workspace:^",
+    "@types/geojson": "^7946.0.10",
     "tslib": "^2.6.2"
   }
 }

packages/turf-area/package.json

@@ -65,6 +65,7 @@
   "dependencies": {
     "@turf/helpers": "workspace:^",
     "@turf/meta": "workspace:^",
+    "@types/geojson": "^7946.0.10",
     "tslib": "^2.6.2"
   }
 }

packages/turf-bbox-clip/package.json

@@ -72,6 +72,7 @@
   "dependencies": {
     "@turf/helpers": "workspace:^",
     "@turf/invariant": "workspace:^",
+    "@types/geojson": "^7946.0.10",
     "tslib": "^2.6.2"
   }
 }

packages/turf-bbox-polygon/package.json

@@ -63,6 +63,7 @@
   },
   "dependencies": {
     "@turf/helpers": "workspace:^",
+    "@types/geojson": "^7946.0.10",
     "tslib": "^2.6.2"
   }
 }