Merge remote-tracking branch 'origin/master' into HEAD

Author: mfedderly

.github/workflows/ci.yml

@@ -18,8 +18,9 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
-        node-version: [18.x, 20.x, 22.x, 24.x]
+        node-version: [18.x, 20.x, 22.x, 24.x, 26.x]
 
     steps:
       - name: Checkout

.github/workflows/prerelease.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: true
       matrix:
         node:
-          - 20
+          - 26
         platform:
           - ubuntu-latest
     name: "${{matrix.platform}} / Node.js ${{ matrix.node }}"
@@ -36,21 +36,14 @@ jobs:
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # 4.3.0
         with:
           node-version: ${{ matrix.node-version }}
-          registry-url: "https://registry.npmjs.org"
           cache: "pnpm"
 
-      - run: npm whoami
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-
       - run: pnpm install --frozen-lockfile
 
       - run: pnpm test
 
       - name: run publish
-        run: lerna publish from-package --ignore-scripts true --yes
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: pnpm -r publish --no-git-checks --provenance --access public
 
       - name: Create Github Release
         uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # 2.2.1

.github/workflows/release.yml

@@ -1,38 +1,16 @@
-.rpt2_cache
+# our build directories
 packages/*/dist
-main.js
-main.es.js
-main.mjs
-main.min.js
-index.mjs
-*.min.js
-*.es5.js
-.esm-cache
-package-lock.json
-env
-.nyc_output
-lib-cov
-*.seed
-*.log
-*.csv
-*.dat
-*.out
-*.pid
-.idea/*
-types.js
-.DS_Store
-types.d.ts
-
-pids
-logs
-results
-
-npm-debug.log*
 
+# pnpm-specific
 node_modules
+pnpm-debug.log*
 
+# build caches
+.nx
+
+# editor-specific
 .vscode
+.idea
 
-.nx/
-.cursor/rules/nx-rules.mdc
-.github/instructions/nx.instructions.md
+# os-specific
+.DS_Store

.gitignore

@@ -1,57 +1,49 @@
 // @ts-check
 import * as path from "node:path";
-import { glob } from "glob";
-import * as fs from "node:fs";
+import { existsSync } from "node:fs";
+import * as fs from "node:fs/promises";
 import {
   alphabeticalDependencies,
   alphabeticalScripts,
   packageOrder,
   packageEntry,
   packageScript,
   requireDependency,
+  REMOVE,
 } from "@monorepolint/rules";
 
-const TS_PACKAGES = []; // projects that use typescript to build
-const JS_PACKAGES = []; // projects that use javascript/rollup to build
+const PACKAGES = []; // packages that aren't @turf/turf
 const MAIN_PACKAGE = "@turf/turf";
 
-const TAPE_PACKAGES = []; // projects that have tape tests
-const TYPES_PACKAGES = []; // projects that have types tests
-const TSTYCHE_PACKAGES = []; // projects that use tstyche for type tests.
-const BENCH_PACKAGES = []; // projects that have benchmarks
+const TAPE_PACKAGES = []; // packages that have tape tests
+const TYPES_PACKAGES = []; // packages that have types tests
+const TSTYCHE_PACKAGES = []; // packages that use tstyche for type tests.
 
 // iterate all the packages and figure out what buckets everything falls into
-const __dirname = new URL(".", import.meta.url).pathname;
-glob.sync(path.join(__dirname, "packages", "turf-*")).forEach((pk) => {
+const packagesPath = path.join(process.cwd(), "packages");
+for (const pk of await fs.readdir(packagesPath)) {
+  if (pk === "turf") {
+    continue;
+  }
+
   const name = JSON.parse(
-    fs.readFileSync(path.join(pk, "package.json"), "utf8")
+    await fs.readFile(path.join(packagesPath, pk, "package.json"), "utf8")
   ).name;
 
-  if (fs.existsSync(path.join(pk, "index.ts"))) {
-    TS_PACKAGES.push(name);
-  } else {
-    JS_PACKAGES.push(name);
-  }
+  PACKAGES.push(name);
 
-  if (fs.existsSync(path.join(pk, "test.js"))) {
+  if (existsSync(path.join(pk, "test.js"))) {
     TAPE_PACKAGES.push(name);
   }
 
-  if (fs.existsSync(path.join(pk, "types.ts"))) {
+  if (existsSync(path.join(packagesPath, pk, "types.ts"))) {
     TYPES_PACKAGES.push(name);
   }
 
-  if (fs.existsSync(path.join(pk, "test/types.tst.ts"))) {
+  if (existsSync(path.join(packagesPath, pk, "test/types.tst.ts"))) {
     TSTYCHE_PACKAGES.push(name);
   }
-});
-
-const TS_TAPE_PACKAGES = TAPE_PACKAGES.filter(
-  (pkg) => -1 !== TS_PACKAGES.indexOf(pkg)
-);
-const JS_TAPE_PACKAGES = TAPE_PACKAGES.filter(
-  (pkg) => -1 !== JS_PACKAGES.indexOf(pkg)
-);
+}
 
 export default {
   rules: [
@@ -152,7 +144,7 @@ export default {
           },
         },
       },
-      includePackages: [...TS_PACKAGES, ...JS_PACKAGES],
+      includePackages: PACKAGES,
     }),
 
     packageEntry({
@@ -161,7 +153,7 @@ export default {
           files: ["dist"],
         },
       },
-      includePackages: [...TS_PACKAGES, ...JS_PACKAGES],
+      includePackages: PACKAGES,
     }),
 
     packageEntry({
@@ -175,7 +167,7 @@ export default {
     packageScript({
       options: {
         scripts: {
-          docs: "tsx ../../scripts/generate-readmes.ts",
+          docs: REMOVE,
           test: "pnpm run /test:.*/",
         },
       },
@@ -188,7 +180,7 @@ export default {
           build: "tsup --config ../../tsup.config.ts",
         },
       },
-      includePackages: [...TS_PACKAGES, ...JS_PACKAGES],
+      includePackages: PACKAGES,
     }),
 
     packageScript({
@@ -208,7 +200,7 @@ export default {
           "test:tape": "tsx test.ts",
         },
       },
-      includePackages: [...TS_TAPE_PACKAGES, ...JS_TAPE_PACKAGES],
+      includePackages: TAPE_PACKAGES,
     }),
 
     packageScript({
@@ -233,33 +225,34 @@ export default {
     requireDependency({
       options: {
         devDependencies: {
-          benchmark: "^2.1.4",
-          tape: "^5.9.0",
-          tsup: "^8.4.0",
-          tsx: "^4.19.4",
+          benchmark: "catalog:",
+          glob: REMOVE,
+          tape: "catalog:",
+          tsup: "catalog:",
+          tsx: "catalog:",
         },
       },
-      includePackages: [...TS_PACKAGES, ...JS_PACKAGES],
+      includePackages: PACKAGES,
     }),
 
     requireDependency({
       options: {
         dependencies: {
-          tslib: "^2.8.1",
+          tslib: "catalog:",
         },
         devDependencies: {
-          "@types/benchmark": "^2.1.5",
-          "@types/tape": "^5.8.1",
-          typescript: "^5.8.3",
+          "@types/benchmark": "catalog:",
+          "@types/tape": "catalog:",
+          typescript: "catalog:",
         },
       },
-      includePackages: TS_PACKAGES,
+      includePackages: PACKAGES,
     }),
 
     requireDependency({
       options: {
         devDependencies: {
-          tstyche: "^6.2.0",
+          tstyche: "catalog:",
         },
       },
       includePackages: TSTYCHE_PACKAGES,
@@ -268,10 +261,10 @@ export default {
     requireDependency({
       options: {
         dependencies: {
-          "@types/geojson": "^7946.0.10",
+          "@types/geojson": "catalog:",
         },
       },
-      includePackages: [MAIN_PACKAGE, ...TS_PACKAGES, ...JS_PACKAGES],
+      includePackages: [MAIN_PACKAGE, ...PACKAGES],
     }),
   ],
 };

.monorepolint.config.mjs

@@ -124,7 +124,7 @@ JSDoc comments are found in the top-level index file for each package (for examp
 
 We have lots of tooling dedicated to ensuring consistent code. We use [Prettier](https://prettier.io/), [TypeScript](https://www.typescriptlang.org/), and [ESLint](https://eslint.org/) to help us deliver quality code. These are checked by the build system and should be enforced at commit time by [Husky](https://typicode.github.io/husky/#/).
 
-Most packages are written in TypeScript, while a few plain Javascript still linger. You can generally use modern Javascript when modifying Turf itself as all exported code is transpiled to (currently es2017).
+Packages are written in TypeScript. You can generally use modern TypeScript when modifying Turf itself as all exported code is transpiled to a more compatible subset (currently es2017).
 
 Code for consumption by browsers is transpiled by Babel as described in the README.
 
@@ -140,25 +140,13 @@ Should you want to generate new README files manually, use `pnpm run docs`:
 
 ### Documentation - Examples
 
-**Build docs for only `@turf/center`**
-
-```bash
-$ cd ./turf/packages/turf-center
-$ pnpm run docs
-
-> @turf/center@5.0.4 docs /Users/mac/Github/turf/packages/turf-center
-> node ../../scripts/generate-readmes
-
-Building Docs: @turf/center
-```
-
 **Builds docs for all packages**
 
 ```bash
 $ cd ./turf
 $ pnpm run docs
 > @ docs /Users/mac/Github/turf
-> tsx ./scripts/generate-readmes
+> node ./scripts/generate-readmes.mts
 
 Building Docs: @turf/along
 Building Docs: @turf/area
@@ -171,6 +159,8 @@ Building Docs: @turf/boolean-clockwise
 ....
 ```
 
+Note: This should be automatically executed with a pre-commit hook when necessary
+
 ### Public website
 
 The [turfjs.org](https://turfjs.org/) website is managed in a [separate repo](https://github.com/Turfjs/turf-www) with its own [contributing guide](https://github.com/Turfjs/turf-www/blob/master/CONTRIBUTING.md).

docs/CONTRIBUTING.md

@@ -1,7 +1,7 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "npmClient": "pnpm",
-  "version": "7.3.4",
+  "version": "7.3.5",
   "command": {
     "publish": {
       "registry": "https://registry.npmjs.org"