Use tsup to build.

This also updates ts to 4.7, since this is the minimum required version for the correct node resolution.
Turfjs · May 2, 2024 · 9d45647 · 9d45647
1 parent 5135e61
commit 9d45647
Show file tree

Hide file tree

Showing 119 changed files with 2,377 additions and 937 deletions.
diff --git a/.monorepolint.config.ts b/.monorepolint.config.ts
@@ -1,20 +1,20 @@
-const path = require("path");
-const glob = require("glob");
-const fs = require("fs");
+import path from "path";
+import glob from "glob";
+import fs from "fs";
 
-const TS_PACKAGES = []; // projects that use typescript to build
-const JS_PACKAGES = []; // projects that use javascript/rollup to build
+const TS_PACKAGES = [] as string[]; // projects that use typescript to build
+const JS_PACKAGES = [] as string[]; // projects that use javascript/rollup to build
 const MAIN_PACKAGE = "@turf/turf";
 
-const TAPE_PACKAGES = []; // projects that have tape tests
-const TYPES_PACKAGES = []; // projects that have types tests
-const BENCH_PACKAGES = []; // projects that have benchmarks
+const TAPE_PACKAGES = [] as string[]; // projects that have tape tests
+const TYPES_PACKAGES = [] as string[]; // projects that have types tests
+const BENCH_PACKAGES = [] as string[]; // projects that have benchmarks
 
 // iterate all the packages and figure out what buckets everything falls into
-glob.sync(path.join(__dirname, "packages", "turf-*")).forEach((pk) => {
+glob.sync(path.join(__dirname, "packages", "turf-*")).forEach((pk: string) => {
   const name = JSON.parse(
     fs.readFileSync(path.join(pk, "package.json"), "utf8")
-  ).name;
+  ).name as string;
 
   if (fs.existsSync(path.join(pk, "index.ts"))) {
     TS_PACKAGES.push(name);
@@ -107,41 +107,31 @@ module.exports = {
       {
         options: {
           entries: {
-            main: "dist/js/index.js",
-            module: "dist/es/index.js",
+            type: "commonjs",
+            main: "dist/cjs/index.js",
+            module: "dist/esm/index.mjs",
+            types: "dist/cjs/index.d.ts",
             sideEffects: false,
             publishConfig: {
               access: "public",
             },
             exports: {
               "./package.json": "./package.json",
               ".": {
-                import: "./dist/es/index.js",
-                require: "./dist/js/index.js",
+                import: {
+                  types: "./dist/esm/index.d.mts",
+                  default: "./dist/esm/index.mjs",
+                },
+                require: {
+                  types: "./dist/cjs/index.d.ts",
+                  default: "./dist/cjs/index.js",
+                },
               },
             },
           },
         },
         includePackages: [...TS_PACKAGES, ...JS_PACKAGES],
       },
-      {
-        options: {
-          entries: {
-            types: "dist/js/index.d.ts",
-            files: ["dist"],
-          },
-        },
-        includePackages: TS_PACKAGES,
-      },
-      {
-        options: {
-          entries: {
-            types: "index.d.ts",
-            files: ["dist", "index.d.ts"],
-          },
-        },
-        includePackages: JS_PACKAGES,
-      },
       {
         options: {
           entries: {
@@ -164,22 +154,10 @@ module.exports = {
       {
         options: {
           scripts: {
-            build: "npm-run-all build:*",
-            "build:js": "tsc",
-            "build:es":
-              'tsc --outDir dist/es --module esnext --declaration false && echo \'{"type":"module"}\' > dist/es/package.json',
-          },
-        },
-        includePackages: TS_PACKAGES,
-      },
-      {
-        options: {
-          scripts: {
-            build:
-              'rollup -c ../../rollup.config.js && echo \'{"type":"module"}\' > dist/es/package.json',
+            build: "tsup --config ../../tsup.config.ts",
           },
         },
-        includePackages: JS_PACKAGES,
+        includePackages: [...JS_PACKAGES, ...TS_PACKAGES],
       },
       {
         options: {
@@ -257,10 +235,10 @@ module.exports = {
       {
         options: {
           devDependencies: {
-            rollup: "*",
+            tsup: "^8.0.1",
           },
         },
-        includePackages: JS_PACKAGES,
+        includePackages: [...JS_PACKAGES, ...TS_PACKAGES],
       },
     ],
   },

diff --git a/package.json b/package.json
@@ -58,8 +58,8 @@
     "progress": "*",
     "rollup": "^2.34.2",
     "tape": "*",
-    "ts-node": "^9.0.0",
-    "typescript": "^3.8.3",
+    "ts-node": "^10.9.0",
+    "typescript": "~4.7.2",
     "yamljs": "*"
   }
 }
diff --git a/packages/turf-along/package.json b/packages/turf-along/package.json
@@ -23,14 +23,21 @@
     "turf",
     "distance"
   ],
-  "main": "dist/js/index.js",
-  "module": "dist/es/index.js",
-  "types": "dist/js/index.d.ts",
+  "type": "commonjs",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/cjs/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "import": "./dist/es/index.js",
-      "require": "./dist/js/index.js"
+      "import": {
+        "types": "./dist/esm/index.d.mts",
+        "default": "./dist/esm/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "sideEffects": false,
@@ -39,9 +46,7 @@
   ],
   "scripts": {
     "bench": "ts-node bench.js",
-    "build": "npm-run-all build:*",
-    "build:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
-    "build:js": "tsc",
+    "build": "tsup --config ../../tsup.config.ts",
     "docs": "node ../../scripts/generate-readmes",
     "test": "npm-run-all test:*",
     "test:tape": "ts-node -r esm test.js"
@@ -54,6 +59,7 @@
     "tape": "*",
     "ts-node": "*",
     "tslint": "*",
+    "tsup": "^8.0.1",
     "typescript": "*"
   },
   "dependencies": {

diff --git a/packages/turf-angle/package.json b/packages/turf-angle/package.json
@@ -23,14 +23,21 @@
     "turf",
     "angle"
   ],
-  "main": "dist/js/index.js",
-  "module": "dist/es/index.js",
-  "types": "dist/js/index.d.ts",
+  "type": "commonjs",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/cjs/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "import": "./dist/es/index.js",
-      "require": "./dist/js/index.js"
+      "import": {
+        "types": "./dist/esm/index.d.mts",
+        "default": "./dist/esm/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "sideEffects": false,
@@ -39,9 +46,7 @@
   ],
   "scripts": {
     "bench": "ts-node bench.js",
-    "build": "npm-run-all build:*",
-    "build:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
-    "build:js": "tsc",
+    "build": "tsup --config ../../tsup.config.ts",
     "docs": "node ../../scripts/generate-readmes",
     "test": "npm-run-all test:*",
     "test:tape": "ts-node -r esm test.js"
@@ -58,6 +63,7 @@
     "tape": "*",
     "ts-node": "*",
     "tslint": "*",
+    "tsup": "^8.0.1",
     "typescript": "*",
     "write-json-file": "*"
   },

diff --git a/packages/turf-area/package.json b/packages/turf-area/package.json
@@ -22,14 +22,21 @@
     "polygon",
     "multipolygon"
   ],
-  "main": "dist/js/index.js",
-  "module": "dist/es/index.js",
-  "types": "dist/js/index.d.ts",
+  "type": "commonjs",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/cjs/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "import": "./dist/es/index.js",
-      "require": "./dist/js/index.js"
+      "import": {
+        "types": "./dist/esm/index.d.mts",
+        "default": "./dist/esm/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "sideEffects": false,
@@ -38,9 +45,7 @@
   ],
   "scripts": {
     "bench": "ts-node bench.js",
-    "build": "npm-run-all build:*",
-    "build:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
-    "build:js": "tsc",
+    "build": "tsup --config ../../tsup.config.ts",
     "docs": "node ../../scripts/generate-readmes",
     "test": "npm-run-all test:*",
     "test:tape": "ts-node -r esm test.js"
@@ -53,6 +58,7 @@
     "tape": "*",
     "ts-node": "*",
     "tslint": "*",
+    "tsup": "^8.0.1",
     "typescript": "*",
     "write-json-file": "*"
   },

diff --git a/packages/turf-bbox-clip/package.json b/packages/turf-bbox-clip/package.json
@@ -28,14 +28,21 @@
     "bbox",
     "clip"
   ],
-  "main": "dist/js/index.js",
-  "module": "dist/es/index.js",
-  "types": "dist/js/index.d.ts",
+  "type": "commonjs",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/cjs/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "import": "./dist/es/index.js",
-      "require": "./dist/js/index.js"
+      "import": {
+        "types": "./dist/esm/index.d.mts",
+        "default": "./dist/esm/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "sideEffects": false,
@@ -44,9 +51,7 @@
   ],
   "scripts": {
     "bench": "ts-node bench.js",
-    "build": "npm-run-all build:*",
-    "build:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
-    "build:js": "tsc",
+    "build": "tsup --config ../../tsup.config.ts",
     "docs": "node ../../scripts/generate-readmes",
     "test": "npm-run-all test:*",
     "test:tape": "ts-node -r esm test.js"
@@ -60,6 +65,7 @@
     "tape": "*",
     "ts-node": "*",
     "tslint": "*",
+    "tsup": "^8.0.1",
     "typescript": "*",
     "write-json-file": "*"
   },

diff --git a/packages/turf-bbox-polygon/package.json b/packages/turf-bbox-polygon/package.json
@@ -23,14 +23,21 @@
     "extent",
     "bbox"
   ],
-  "main": "dist/js/index.js",
-  "module": "dist/es/index.js",
-  "types": "dist/js/index.d.ts",
+  "type": "commonjs",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/cjs/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "import": "./dist/es/index.js",
-      "require": "./dist/js/index.js"
+      "import": {
+        "types": "./dist/esm/index.d.mts",
+        "default": "./dist/esm/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "sideEffects": false,
@@ -39,9 +46,7 @@
   ],
   "scripts": {
     "bench": "ts-node bench.js",
-    "build": "npm-run-all build:*",
-    "build:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
-    "build:js": "tsc",
+    "build": "tsup --config ../../tsup.config.ts",
     "docs": "node ../../scripts/generate-readmes",
     "test": "npm-run-all test:*",
     "test:tape": "ts-node -r esm test.js"
@@ -53,6 +58,7 @@
     "tape": "*",
     "ts-node": "*",
     "tslint": "*",
+    "tsup": "^8.0.1",
     "typescript": "*"
   },
   "dependencies": {