Incorporating some suggestions from @favna on being more explicit wit…

…h d.ts entries. Turfjs#2307 (comment) Specifying overall module type as commonjs explicitly.
smallsaucepan · Dec 16, 2023 · faa15c8 · faa15c8
1 parent effc083
commit faa15c8
Show file tree

Hide file tree

Showing 118 changed files with 1,523 additions and 576 deletions.
diff --git a/package.json b/package.json
@@ -6,8 +6,8 @@
     "lint:eslint": "eslint packages",
     "lint:prettier": "prettier --check .",
     "lintDISABLED:mrl": "mrl check",
-    "lint:escheck-cjs": "es-check es8 packages/*/dist/index.js packages/turf/turf.min.js",
-    "lint:escheck-esm": "es-check --module es8 packages/*/dist/index.mjs",
+    "lint:escheck-cjs": "es-check es8 packages/*/dist/cjs/index.cjs packages/turf/turf.min.js",
+    "lint:escheck-esm": "es-check --module es8 packages/*/dist/esm/index.mjs",
     "lint:escheck-web": "es-check es5 packages/turf/turf.min.js",
     "lint:docs": "documentation lint packages/turf-*/index.js packages/turf-*/index.mjs",
     "preinstall": "npx only-allow pnpm",
@@ -61,6 +61,7 @@
     "progress": "^2.0.3",
     "rollup": "^2.79.1",
     "ts-node": "^9.0.0",
+    "tsup": "^8.0.1",
     "tsx": "^4.6.2",
     "typescript": "^5.2.2",
     "yamljs": "^0.3.0"

diff --git a/packages/turf-along/package.json b/packages/turf-along/package.json
@@ -23,13 +23,21 @@
     "turf",
     "distance"
   ],
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "type": "commonjs",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/cjs/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
+      "import": {
+        "types": "./dist/esm/index.d.mts",
+        "default": "./dist/esm/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.cjs"
+      }
     }
   },
   "sideEffects": false,
@@ -38,7 +46,7 @@
   ],
   "scripts": {
     "bench": "tsx bench.ts",
-    "build": "tsup index.?s --dts --format esm,cjs --cjsInterop --splitting",
+    "build": "tsup --config ../../tsup.config.ts",
     "docs": "tsx ../../scripts/generate-readmes.ts",
     "test": "npm-run-all --npm-path npm test:*",
     "test:tape": "tsx test.ts"

diff --git a/packages/turf-angle/package.json b/packages/turf-angle/package.json
@@ -23,13 +23,21 @@
     "turf",
     "angle"
   ],
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "type": "commonjs",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/cjs/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
+      "import": {
+        "types": "./dist/esm/index.d.mts",
+        "default": "./dist/esm/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.cjs"
+      }
     }
   },
   "sideEffects": false,
@@ -38,7 +46,7 @@
   ],
   "scripts": {
     "bench": "tsx bench.ts",
-    "build": "tsup index.?s --dts --format esm,cjs --cjsInterop --splitting",
+    "build": "tsup --config ../../tsup.config.ts",
     "docs": "tsx ../../scripts/generate-readmes.ts",
     "test": "npm-run-all --npm-path npm test:*",
     "test:tape": "tsx test.ts"

diff --git a/packages/turf-area/package.json b/packages/turf-area/package.json
@@ -22,13 +22,21 @@
     "polygon",
     "multipolygon"
   ],
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "type": "commonjs",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/cjs/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
+      "import": {
+        "types": "./dist/esm/index.d.mts",
+        "default": "./dist/esm/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.cjs"
+      }
     }
   },
   "sideEffects": false,
@@ -37,7 +45,7 @@
   ],
   "scripts": {
     "bench": "tsx bench.ts",
-    "build": "tsup index.?s --dts --format esm,cjs --cjsInterop --splitting",
+    "build": "tsup --config ../../tsup.config.ts",
     "docs": "tsx ../../scripts/generate-readmes.ts",
     "test": "npm-run-all --npm-path npm test:*",
     "test:tape": "tsx test.ts"

diff --git a/packages/turf-bbox-clip/package.json b/packages/turf-bbox-clip/package.json
@@ -28,13 +28,21 @@
     "bbox",
     "clip"
   ],
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "type": "commonjs",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/cjs/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
+      "import": {
+        "types": "./dist/esm/index.d.mts",
+        "default": "./dist/esm/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.cjs"
+      }
     }
   },
   "sideEffects": false,
@@ -43,7 +51,7 @@
   ],
   "scripts": {
     "bench": "tsx bench.ts",
-    "build": "tsup index.?s --dts --format esm,cjs --cjsInterop --splitting",
+    "build": "tsup --config ../../tsup.config.ts",
     "docs": "tsx ../../scripts/generate-readmes.ts",
     "test": "npm-run-all --npm-path npm test:*",
     "test:tape": "tsx test.ts"

diff --git a/packages/turf-bbox-polygon/package.json b/packages/turf-bbox-polygon/package.json
@@ -23,13 +23,21 @@
     "extent",
     "bbox"
   ],
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "type": "commonjs",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/cjs/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
+      "import": {
+        "types": "./dist/esm/index.d.mts",
+        "default": "./dist/esm/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.cjs"
+      }
     }
   },
   "sideEffects": false,
@@ -38,7 +46,7 @@
   ],
   "scripts": {
     "bench": "tsx bench.ts",
-    "build": "tsup index.?s --dts --format esm,cjs --cjsInterop --splitting",
+    "build": "tsup --config ../../tsup.config.ts",
     "docs": "tsx ../../scripts/generate-readmes.ts",
     "test": "npm-run-all --npm-path npm test:*",
     "test:tape": "tsx test.ts"

diff --git a/packages/turf-bbox/package.json b/packages/turf-bbox/package.json
@@ -24,13 +24,21 @@
     "featurecollection",
     "geojson"
   ],
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "type": "commonjs",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/cjs/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
+      "import": {
+        "types": "./dist/esm/index.d.mts",
+        "default": "./dist/esm/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.cjs"
+      }
     }
   },
   "sideEffects": false,
@@ -39,7 +47,7 @@
   ],
   "scripts": {
     "bench": "tsx bench.ts",
-    "build": "tsup index.?s --dts --format esm,cjs --cjsInterop --splitting",
+    "build": "tsup --config ../../tsup.config.ts",
     "docs": "tsx ../../scripts/generate-readmes.ts",
     "test": "npm-run-all --npm-path npm test:*",
     "test:tape": "tsx test.ts"

diff --git a/packages/turf-bearing/package.json b/packages/turf-bearing/package.json
@@ -20,13 +20,21 @@
     "turf",
     "bearing"
   ],
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "type": "commonjs",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/cjs/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
+      "import": {
+        "types": "./dist/esm/index.d.mts",
+        "default": "./dist/esm/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.cjs"
+      }
     }
   },
   "sideEffects": false,
@@ -35,7 +43,7 @@
   ],
   "scripts": {
     "bench": "tsx bench.ts",
-    "build": "tsup index.?s --dts --format esm,cjs --cjsInterop --splitting",
+    "build": "tsup --config ../../tsup.config.ts",
     "docs": "tsx ../../scripts/generate-readmes.ts",
     "test": "npm-run-all --npm-path npm test:*",
     "test:tape": "tsx test.ts"

diff --git a/packages/turf-bezier-spline/package.json b/packages/turf-bezier-spline/package.json
@@ -23,13 +23,21 @@
     "curve",
     "linestring"
   ],
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "type": "commonjs",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/cjs/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
+      "import": {
+        "types": "./dist/esm/index.d.mts",
+        "default": "./dist/esm/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.cjs"
+      }
     }
   },
   "sideEffects": false,
@@ -38,7 +46,7 @@
   ],
   "scripts": {
     "bench": "tsx bench.ts",
-    "build": "tsup index.?s --dts --format esm,cjs --cjsInterop --splitting",
+    "build": "tsup --config ../../tsup.config.ts",
     "docs": "tsx ../../scripts/generate-readmes.ts",
     "test": "npm-run-all --npm-path npm test:*",
     "test:tape": "tsx test.ts"

diff --git a/packages/turf-boolean-clockwise/package.json b/packages/turf-boolean-clockwise/package.json
@@ -27,13 +27,21 @@
     "clockwise",
     "boolean"
   ],
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "type": "commonjs",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/cjs/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
+      "import": {
+        "types": "./dist/esm/index.d.mts",
+        "default": "./dist/esm/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.cjs"
+      }
     }
   },
   "sideEffects": false,
@@ -42,7 +50,7 @@
   ],
   "scripts": {
     "bench": "tsx bench.ts",
-    "build": "tsup index.?s --dts --format esm,cjs --cjsInterop --splitting",
+    "build": "tsup --config ../../tsup.config.ts",
     "docs": "tsx ../../scripts/generate-readmes.ts",
     "test": "npm-run-all --npm-path npm test:*",
     "test:tape": "tsx test.ts"

diff --git a/packages/turf-boolean-concave/package.json b/packages/turf-boolean-concave/package.json
@@ -26,13 +26,21 @@
     "convex",
     "boolean"
   ],
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "type": "commonjs",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/cjs/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
+      "import": {
+        "types": "./dist/esm/index.d.mts",
+        "default": "./dist/esm/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.cjs"
+      }
     }
   },
   "sideEffects": false,
@@ -41,7 +49,7 @@
   ],
   "scripts": {
     "bench": "tsx bench.ts",
-    "build": "tsup index.?s --dts --format esm,cjs --cjsInterop --splitting",
+    "build": "tsup --config ../../tsup.config.ts",
     "docs": "tsx ../../scripts/generate-readmes.ts",
     "test": "npm-run-all --npm-path npm test:*",
     "test:tape": "tsx test.ts"