Speed up development builds and drop tsup

.gitignore

@@ -35,4 +35,5 @@ node_modules
 
 .nx/
 .cursor/rules/nx-rules.mdc
+.eslintcache
 .github/instructions/nx.instructions.md

.monorepolint.config.mjs

@@ -1,4 +1,3 @@
-// @ts-check
 import * as path from "node:path";
 import { existsSync } from "node:fs";
 import * as fs from "node:fs/promises";
@@ -10,13 +9,15 @@ import {
   packageScript,
   requireDependency,
   REMOVE,
+  standardTsconfig,
+  fileContents,
 } from "@monorepolint/rules";
 
 const PACKAGES = []; // packages that aren't @turf/turf
-const MAIN_PACKAGE = "@turf/turf";
+const AGG_PACKAGE = "@turf/turf"; // aggregate package utilising rollup
 
-const TAPE_PACKAGES = []; // packages that have tape tests
-const TYPES_PACKAGES = []; // packages that have types tests
+const TAPE_PACKAGES = []; // packages with tape tests
+const TYPES_PACKAGES = []; // packages with types tests
 const TSTYCHE_PACKAGES = []; // packages that use tstyche for type tests.
 
 // iterate all the packages and figure out what buckets everything falls into
@@ -32,7 +33,7 @@ for (const pk of await fs.readdir(packagesPath)) {
 
   PACKAGES.push(name);
 
-  if (existsSync(path.join(pk, "test.js"))) {
+  if (existsSync(path.join(pk, "test.ts"))) {
     TAPE_PACKAGES.push(name);
   }
 
@@ -83,23 +84,28 @@ export default {
     }),
     alphabeticalDependencies({ includeWorkspaceRoot: true }),
     alphabeticalScripts({ includeWorkspaceRoot: true }),
+    standardTsconfig({
+      options: { templateFile: "./templates/package/tsconfig.json" },
+      includePackages: [...PACKAGES, AGG_PACKAGE],
+    }),
+    standardTsconfig({
+      options: {
+        file: "tsconfig.cjs.json",
+        templateFile: "./templates/package/tsconfig.cjs.json",
+      },
+      includePackages: [...PACKAGES, AGG_PACKAGE],
+    }),
     packageEntry({
       options: {
         entries: {
           type: "module",
-          main: "dist/cjs/index.cjs",
+          main: "dist/cjs/index.js",
           module: "dist/esm/index.js",
           types: "dist/esm/index.d.ts",
           sideEffects: false,
           publishConfig: {
             access: "public",
           },
-          // @turf/turf is commonly consumed through CDNs, moving this output file is a breaking change for anyone
-          // who has a hardcoded reference to this specific file, instead of letting the CDN pick the path.
-          // Example of a URL that will break: https://unpkg.com/@turf/turf/dist/turf.min.js
-          // Example of a URL that will keep working: https://unpkg.com/@turf/turf
-          browser: "turf.min.js",
-          files: ["dist", "turf.min.js"],
           exports: {
             "./package.json": "./package.json",
             ".": {
@@ -108,107 +114,89 @@ export default {
                 default: "./dist/esm/index.js",
               },
               require: {
-                types: "./dist/cjs/index.d.cts",
-                default: "./dist/cjs/index.cjs",
+                types: "./dist/cjs/index.d.ts",
+                default: "./dist/cjs/index.js",
               },
             },
           },
         },
       },
-      includePackages: [MAIN_PACKAGE],
+      includePackages: PACKAGES,
     }),
-
     packageEntry({
       options: {
         entries: {
-          type: "module",
-          main: "dist/cjs/index.cjs",
-          module: "dist/esm/index.js",
-          types: "dist/esm/index.d.ts",
-          sideEffects: false,
-          publishConfig: {
-            access: "public",
-          },
-          exports: {
-            "./package.json": "./package.json",
-            ".": {
-              import: {
-                types: "./dist/esm/index.d.ts",
-                default: "./dist/esm/index.js",
-              },
-              require: {
-                types: "./dist/cjs/index.d.cts",
-                default: "./dist/cjs/index.cjs",
-              },
-            },
-          },
+          files: ["dist"],
         },
       },
       includePackages: PACKAGES,
+      excludePackages: [AGG_PACKAGE],
     }),
-
     packageEntry({
       options: {
         entries: {
-          files: ["dist"],
+          // @turf/turf is commonly consumed through CDNs, moving this output file is a breaking change for anyone
+          // who has a hardcoded reference to this specific file, instead of letting the CDN pick the path.
+          // Example of a URL that will break: https://unpkg.com/@turf/turf/dist/turf.min.js
+          // Ex ample of a URL that will keep working: https://unpkg.com/@turf/turf
+          browser: "turf.min.js",
+          files: ["dist", "turf.min.js"],
         },
       },
-      includePackages: PACKAGES,
+      includePackages: [AGG_PACKAGE],
     }),
-
     packageEntry({
       options: {
         entries: {
           funding: "https://opencollective.com/turf",
         },
       },
     }),
-
     packageScript({
       options: {
         scripts: {
           docs: REMOVE,
+          rollup: "rollup -c rollup.config.js",
           test: "pnpm run /test:.*/",
         },
       },
-      excludePackages: [MAIN_PACKAGE],
+      includePackages: [AGG_PACKAGE],
     }),
-
     packageScript({
       options: {
         scripts: {
-          build: "tsup --config ../../tsup.config.ts",
+          build: "tsc -b",
+          "build:cjs": REMOVE,
+          "build:esm": REMOVE,
+          prepack: "tsc -b tsconfig.cjs.json",
         },
       },
-      includePackages: PACKAGES,
+      includePackages: [...PACKAGES, AGG_PACKAGE],
     }),
 
     packageScript({
       options: {
         scripts: {
-          build:
-            "tsup --config ../../tsup.config.ts && rollup -c rollup.config.js",
+          bench: "tsx bench.ts",
+          "test:tape": "tsx test.ts",
         },
       },
-      includePackages: [MAIN_PACKAGE],
+      includePackages: TAPE_PACKAGES,
     }),
 
     packageScript({
       options: {
         scripts: {
-          bench: "tsx bench.ts",
-          "test:tape": "tsx test.ts",
+          "test:types": "tsc --project tsconfig.types.json",
         },
       },
-      includePackages: TAPE_PACKAGES,
+      includePackages: TYPES_PACKAGES,
     }),
 
-    packageScript({
+    fileContents({
       options: {
-        scripts: {
-          "test:types":
-            "tsc --esModuleInterop --module node16 --moduleResolution node16 --noEmit --strict types.ts",
-        },
+        file: "tsconfig.types.json",
+        templateFile: "./templates/package/tsconfig.types.json",
       },
       includePackages: TYPES_PACKAGES,
     }),
@@ -224,28 +212,29 @@ export default {
 
     requireDependency({
       options: {
+        dependencies: {
+          "@types/geojson": "catalog:",
+          tslib: "catalog:",
+        },
         devDependencies: {
+          "@types/benchmark": "catalog:",
+          "@types/tape": "catalog:",
           benchmark: "catalog:",
-          glob: REMOVE,
           tape: "catalog:",
-          tsup: "catalog:",
           tsx: "catalog:",
+          typescript: "catalog:",
         },
       },
-      includePackages: PACKAGES,
+      includePackages: [...PACKAGES, AGG_PACKAGE],
     }),
 
     requireDependency({
       options: {
-        dependencies: {
-          tslib: "catalog:",
-        },
         devDependencies: {
-          "@types/benchmark": "catalog:",
-          "@types/tape": "catalog:",
-          typescript: "catalog:",
+          glob: REMOVE,
         },
       },
+      // Keep glob for @turf/turf test for now. Remove after refactoring.
       includePackages: PACKAGES,
     }),
 
@@ -257,14 +246,5 @@ export default {
       },
       includePackages: TSTYCHE_PACKAGES,
     }),
-
-    requireDependency({
-      options: {
-        dependencies: {
-          "@types/geojson": "catalog:",
-        },
-      },
-      includePackages: [MAIN_PACKAGE, ...PACKAGES],
-    }),
   ],
 };

.prettierignore

@@ -10,4 +10,10 @@ pnpm-lock.yaml
 
 /.nx/cache
 
-/.nx/workspace-data
+/.nx/workspace-data
+
+# Auto generated by mrl, which produces a slightly clashing format.
+tsconfig.json
+tsconfig.cjs.json
+tsconfig.shared.json
+tsconfig.types.json

nx.json

@@ -1,26 +1,18 @@
 {
+  "analytics": false,
+  "tui": {
+    "enabled": false
+  },
   "namedInputs": {
     "default": [
       "{workspaceRoot}/pnpm-lock.yaml",
       "{workspaceRoot}/tsconfig.shared.json",
       "{projectRoot}/package.json",
       "{projectRoot}/tsconfig.json"
     ],
-    "sources": ["{projectRoot}/index.{js,ts}", "{projectRoot}/lib/**"]
+    "sources": ["{projectRoot}/index.ts", "{projectRoot}/lib/**"]
   },
   "targetDefaults": {
-    "build": {
-      "dependsOn": ["^build"],
-      "inputs": [
-        "default",
-        "sources",
-        "{workspaceRoot}/tsup.config.ts",
-        "{projectRoot}/index.d.ts",
-        "{projectRoot}/rollup.config.cjs"
-      ],
-      "outputs": ["{projectRoot}/dist"],
-      "cache": true
-    },
     "test": {
       "inputs": [
         "default",
@@ -29,12 +21,7 @@
         "{projectRoot}/test/**",
         "{projectRoot}/types.ts"
       ],
-      "dependsOn": ["build"],
-      "cache": true
-    },
-    "last-checks": {
-      "inputs": ["default", "{projectRoot}/test.ts"],
-      "dependsOn": ["build", "^last-checks"],
+      "dependsOn": [],
       "cache": true
     }
   }

package.json

@@ -2,18 +2,26 @@
   "private": true,
   "funding": "https://opencollective.com/turf",
   "scripts": {
+    "build": "tsc -b",
+    "dependencies": "tsc -b",
     "docs": "node ./scripts/generate-readmes.mts",
+    "escheck": "pnpm run /escheck:.*/",
+    "escheck:cjs": "es-check es8 packages/*/dist/cjs/index.js packages/turf/turf.min.js",
+    "escheck:esm": "es-check --module es8 packages/*/dist/esm/index.js",
+    "escheck:web": "es-check es5 packages/turf/turf.min.js",
     "lint": "pnpm run /lint:.*/",
     "lint:docs": "documentation lint packages/turf-*/index.js",
-    "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.js",
-    "lint:escheck-web": "es-check es5 packages/turf/turf.min.js",
-    "lint:eslint": "eslint packages",
+    "lint:eslint": "eslint --cache packages",
     "lint:mrl": "mrl check",
-    "lint:prettier": "prettier --check .",
+    "lint:prettier": "prettier --cache --check .",
     "preinstall": "npx only-allow pnpm",
-    "prepare": "husky && lerna run build",
-    "test": "pnpm run lint && lerna run test && lerna run --scope @turf/turf last-checks"
+    "prepack": "tsc -b ./tsconfig.cjs.json && tsx scripts/cjs-package-json.ts && pnpm run --filter @turf/turf rollup",
+    "prepare": "husky && tsc -b",
+    "prepublishOnly": "pnpm run lint && pnpm run escheck && pnpm run --filter @turf/turf last-checks",
+    "release": "pnpm run test:release && pnpm publish -r",
+    "test": "pnpm exec nx run-many -t test",
+    "test:release": "pnpm run lint && pnpm run escheck && pnpm run --filter @turf/turf last-checks",
+    "watch": "tsc -b --watch"
   },
   "lint-staged": {
     "package.json": [
@@ -22,7 +30,7 @@
     "**/*.{js,ts}": [
       "eslint --fix"
     ],
-    "packages/*/index.{js,ts}": [
+    "packages/*/index.ts": [
       "node ./scripts/generate-readmes.mts",
       "git add ./packages/*/README.md"
     ],
@@ -55,9 +63,10 @@
     "lint-staged": "^15.5.1",
     "load-json-file": "^7.0.1",
     "meow": "^13.2.0",
+    "nx": "^22.7.1",
     "prettier": "^3.5.3",
     "progress": "^2.0.3",
-    "tsup": "^8.4.0",
+    "tsx": "^4.19.4",
     "typescript": "^5.8.3",
     "typescript-eslint": "^8.38.0",
     "yaml": "^2.8.2"