Skip to content

Commit 415c648

Browse files
Merge branch 'master' into proz/tessellate-elevation
2 parents 36b1701 + d3b14a1 commit 415c648

321 files changed

Lines changed: 25546 additions & 15224 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ jobs:
1919

2020
strategy:
2121
matrix:
22-
node-version: [18.x, 20.x, 22.x]
22+
node-version: [18.x, 20.x, 22.x, 24.x]
2323

2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
2727

2828
- name: Install pnpm
29-
uses: pnpm/action-setup@v4
29+
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # 4.1.0
3030
with:
3131
run_install: false
3232

3333
- name: Use Node.js ${{ matrix.node-version }}
34-
uses: actions/setup-node@v4
34+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # 4.3.0
3535
with:
3636
cache: "pnpm"
3737
node-version: ${{ matrix.node-version }}

.github/workflows/prerelease.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ jobs:
1717
runs-on: ${{matrix.platform}}
1818

1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
2121
with:
2222
fetch-depth: 0
2323

2424
- name: Install pnpm
25-
uses: pnpm/action-setup@v4
25+
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # 4.1.0
2626
with:
2727
run_install: false
2828

2929
- name: Use Node.js ${{ matrix.node-version }}
30-
uses: actions/setup-node@v4
30+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # 4.3.0
3131
with:
3232
node-version: ${{ matrix.node-version }}
3333
registry-url: "https://registry.npmjs.org"

.github/workflows/release.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- "v*.*.*"
77

88
permissions:
9+
id-token: write
910
contents: write
1011

1112
jobs:
@@ -14,24 +15,24 @@ jobs:
1415
fail-fast: true
1516
matrix:
1617
node:
17-
- 18
18+
- 20
1819
platform:
1920
- ubuntu-latest
2021
name: "${{matrix.platform}} / Node.js ${{ matrix.node }}"
2122
runs-on: ${{matrix.platform}}
2223

2324
steps:
24-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
2526
with:
2627
fetch-depth: 0
2728

2829
- name: Install pnpm
29-
uses: pnpm/action-setup@v4
30+
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # 4.1.0
3031
with:
3132
run_install: false
3233

3334
- name: Use Node.js ${{ matrix.node-version }}
34-
uses: actions/setup-node@v4
35+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # 4.3.0
3536
with:
3637
node-version: ${{ matrix.node-version }}
3738
registry-url: "https://registry.npmjs.org"
@@ -51,7 +52,7 @@ jobs:
5152
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
5253

5354
- name: Create Github Release
54-
uses: softprops/action-gh-release@v2
55+
uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # 2.2.1
5556
with:
5657
make_latest: true
5758
generate_release_notes: true

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,5 @@ node_modules
3434
.vscode
3535

3636
.nx/
37+
.cursor/rules/nx-rules.mdc
38+
.github/instructions/nx.instructions.md

.monorepolint.config.mjs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ export default {
171171
options: {
172172
scripts: {
173173
docs: "tsx ../../scripts/generate-readmes.ts",
174-
test: "npm-run-all --npm-path npm test:*",
174+
test: "pnpm run /test:.*/",
175175
},
176176
},
177177
excludePackages: [MAIN_PACKAGE],
@@ -220,10 +220,9 @@ export default {
220220
options: {
221221
devDependencies: {
222222
benchmark: "^2.1.4",
223-
"npm-run-all": "^4.1.5",
224223
tape: "^5.9.0",
225-
tsup: "^8.3.5",
226-
tsx: "^4.19.2",
224+
tsup: "^8.4.0",
225+
tsx: "^4.19.4",
227226
},
228227
},
229228
includePackages: [...TS_PACKAGES, ...JS_PACKAGES],
@@ -236,8 +235,8 @@ export default {
236235
},
237236
devDependencies: {
238237
"@types/benchmark": "^2.1.5",
239-
"@types/tape": "^4.13.4",
240-
typescript: "^5.5.4",
238+
"@types/tape": "^5.8.1",
239+
typescript: "^5.8.3",
241240
},
242241
},
243242
includePackages: TS_PACKAGES,

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ packages/turf/test.example.js
99
pnpm-lock.yaml
1010

1111
/.nx/cache
12+
13+
/.nx/workspace-data

docs/SEE_ALSO.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Turf has been ported to several other languages, listed below.
44

55
- [Java](https://github.com/mapbox/mapbox-java/tree/master/services-turf/src/main/java/com/mapbox/turf) (Android, Java SE)
66
- > [The current to-do list for porting to Java](https://github.com/mapbox/mapbox-java/blob/master/docs/turf-port.md)
7+
- [Kotlin Multiplatform](https://maplibre.org/spatial-k/) (JVM, Android, Native, JS, WASM)
8+
- > [The current to-do list for porting to Kotlin](https://github.com/maplibre/spatial-k/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20label%3A%22turf%20port%22)
79
- [Swift](https://github.com/mapbox/turf-swift/) (iOS, macOS, tvOS, watchOS, Linux)
810
- > Turf for Swift is **experimental** and its public API is subject to change. Please use with care.
911
- [Dart/Flutter](https://github.com/dartclub/turf_dart) (Dart Web, Dart Native; Flutter for iOS, Android, macOS, Windows, Linux, Web)

eslint.config.mjs

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import typescriptEslint from "@typescript-eslint/eslint-plugin";
21
import globals from "globals";
3-
import tsParser from "@typescript-eslint/parser";
42
import js from "@eslint/js";
53
import tsEslint from "typescript-eslint";
64
import prettierRecommended from "eslint-plugin-prettier/recommended";
@@ -19,15 +17,15 @@ export default tsEslint.config(
1917
},
2018
{
2119
plugins: {
22-
"@typescript-eslint": typescriptEslint,
20+
"@typescript-eslint": tsEslint.plugin,
2321
},
2422

2523
languageOptions: {
2624
globals: {
2725
...globals.node,
2826
},
2927

30-
parser: tsParser,
28+
parser: tsEslint.parser,
3129
ecmaVersion: 6,
3230
sourceType: "module",
3331
},
@@ -73,17 +71,5 @@ export default tsEslint.config(
7371
},
7472
},
7573
},
76-
{
77-
files: [
78-
"packages/turf-isobands/lib/marchingsquares-isobands.js",
79-
"packages/turf-isolines/lib/marchingsquares-isocontours.js",
80-
],
81-
82-
languageOptions: {
83-
globals: {
84-
...globals.browser,
85-
},
86-
},
87-
},
8874
prettierRecommended
8975
);

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
33
"npmClient": "pnpm",
4-
"version": "7.2.0",
4+
"version": "7.3.1",
55
"command": {
66
"publish": {
77
"registry": "https://registry.npmjs.org"

nx.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
"{workspaceRoot}/tsconfig.shared.json",
66
"{projectRoot}/package.json",
77
"{projectRoot}/tsconfig.json"
8-
]
8+
],
9+
"sources": ["{projectRoot}/index.{js,ts}", "{projectRoot}/lib/**"]
910
},
1011
"targetDefaults": {
1112
"build": {
1213
"dependsOn": ["^build"],
1314
"inputs": [
1415
"default",
16+
"sources",
1517
"{workspaceRoot}/tsup.config.ts",
16-
"{projectRoot}/index.{js,ts}",
1718
"{projectRoot}/index.d.ts",
18-
"{projectRoot}/lib/**",
1919
"{projectRoot}/rollup.config.cjs"
2020
],
2121
"outputs": ["{projectRoot}/dist"],
@@ -24,6 +24,7 @@
2424
"test": {
2525
"inputs": [
2626
"default",
27+
"sources",
2728
"{projectRoot}/test.ts",
2829
"{projectRoot}/test/**",
2930
"{projectRoot}/types.ts"

0 commit comments

Comments
 (0)