Removing hacky cjs/esm export/import wrappers in favour of defaultImp…

…ort library which takes care of finding the correct default to import from CJS packages.

packages/turf-clusters-dbscan/index.ts

@@ -2,7 +2,11 @@ import { GeoJsonProperties, FeatureCollection, Point } from "geojson";
 import { clone } from "@turf/clone";
 import { distance } from "@turf/distance";
 import { degreesToRadians, lengthToDegrees, Units } from "@turf/helpers";
-import { rbush as RBush } from "./lib/rbush-export.js";
+import { defaultImport } from "default-import";
+import rbush from "rbush";
+
+// Use defaultImport to get correct default from CJS module.
+const RBush = defaultImport(rbush);
 
 type Dbscan = "core" | "edge" | "noise";
 type DbscanProps = GeoJsonProperties & {

packages/turf-clusters-dbscan/package.json

@@ -81,6 +81,7 @@
     "@turf/distance": "workspace:^",
     "@turf/helpers": "workspace:^",
     "@turf/meta": "workspace:^",
+    "default-import": "^1.1.5",
     "rbush": "^3.0.1",
     "tslib": "^2.6.2"
   }

packages/turf-collect/index.ts

@@ -1,7 +1,11 @@
 import { FeatureCollection, Polygon, Point } from "geojson";
 import { bbox as turfbbox } from "@turf/bbox";
 import { booleanPointInPolygon } from "@turf/boolean-point-in-polygon";
-import { rbush } from "./lib/rbush-export.js";
+import { defaultImport } from "default-import";
+import rbush from "rbush";
+
+// Use defaultImport to get correct default from CJS module.
+const RBush = defaultImport(rbush);
 
 interface Entry {
   minX: number;
@@ -47,7 +51,7 @@ function collect(
   inProperty: string,
   outProperty: string
 ): FeatureCollection<Polygon> {
-  var rtree = new rbush<Entry>(6);
+  var rtree = new RBush<Entry>(6);
 
   var treeItems = points.features.map(function (item) {
     return {

packages/turf-collect/package.json

@@ -70,6 +70,7 @@
     "@turf/bbox": "workspace:^",
     "@turf/boolean-point-in-polygon": "workspace:^",
     "@turf/helpers": "workspace:^",
+    "default-import": "^1.1.5",
     "rbush": "^3.0.1",
     "tslib": "^2.6.2"
   }

packages/turf-kinks/index.ts

@@ -8,7 +8,11 @@ import {
   Polygon,
 } from "geojson";
 import { point } from "@turf/helpers";
-import { sweeplineIntersections as findIntersections } from "./lib/sweepline-intersections-export.js";
+import { defaultImport } from "default-import";
+import sweeplineIntersections from "sweepline-intersections";
+
+// Use defaultImport to get correct default from CJS module.
+const findIntersections = defaultImport(sweeplineIntersections);
 
 /**
  * Takes a {@link LineString|linestring}, {@link MultiLineString|multi-linestring},

packages/turf-kinks/package.json

@@ -65,6 +65,7 @@
   },
   "dependencies": {
     "@turf/helpers": "workspace:^",
+    "default-import": "^1.1.5",
     "sweepline-intersections": "^1.5.0",
     "tslib": "^2.6.2"
   }

packages/turf-line-intersect/index.ts

@@ -8,8 +8,12 @@ import {
   Point,
   Polygon,
 } from "geojson";
+import { defaultImport } from "default-import";
 import type { Intersection } from "sweepline-intersections";
-import { sweeplineIntersections as findIntersections } from "./lib/sweepline-intersections-export.js";
+import sweeplineIntersections from "sweepline-intersections";
+
+// Use defaultImport to get correct default from CJS module.
+const findIntersections = defaultImport(sweeplineIntersections);
 
 /**
  * Takes any LineString or Polygon GeoJSON and returns the intersecting point(s).

packages/turf-line-intersect/package.json

@@ -70,6 +70,7 @@
   },
   "dependencies": {
     "@turf/helpers": "workspace:^",
+    "default-import": "^1.1.5",
     "sweepline-intersections": "^1.5.0",
     "tslib": "^2.6.2"
   }