Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade typescript, prettier, et al to continue to modernise build environment #2519

Merged
merged 4 commits into from
Oct 24, 2023
Merged

Upgrade typescript, prettier, et al to continue to modernise build environment #2519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f6f496
Simplify nx config (no point separately caching es and js builds - th…
smallsaucepan Oct 19, 2023
c5c219d
Upgrade typescript. Had to update topojson-* type defs to avoid the P…
smallsaucepan Oct 20, 2023
fab4570
Retire tslint.
smallsaucepan Oct 20, 2023
f9451ff
Upgrade eslint and prettier. Add minimal prettier config (defaults ha…
smallsaucepan Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ const rules = {
module.exports = {
root: true,
ignorePatterns: ["**/dist/**"],
parser: "@typescript-eslint/parser",
plugins: ["@typescript-eslint"],
extends: [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"prettier",
"prettier/@typescript-eslint",
"plugin:prettier/recommended",
],
parserOptions: {
ecmaVersion: 6,
Expand Down
7 changes: 7 additions & 0 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,10 @@ packages/turf-directional-mean/test/in/bus_route_utm.json

# is actually output
packages/turf/turf.min.js

# Ignore test fixture json in case intentional line breaks help with coord
# readability.
packages/turf-*/test/in/**
packages/turf-*/test/out/**
packages/turf-*/test/true/**
packages/turf-*/test/false/**
4 changes: 3 additions & 1 deletion .prettierrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{}
{
"trailingComma": "es5"
}
2 changes: 1 addition & 1 deletion examples/browser/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
Expand Down
2 changes: 1 addition & 1 deletion examples/create-react-app/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
Expand Down
2 changes: 1 addition & 1 deletion examples/es-modules-single-module/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
Expand Down
2 changes: 1 addition & 1 deletion examples/es-modules/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
Expand Down
32 changes: 1 addition & 31 deletions nx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,7 @@
"default": {
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": [
"build",
"build:es",
"build:js",
"test",
"test:tape",
"test:types",
"last-checks",
"last-checks:example",
"last-checks:testjs"
]
"cacheableOperations": ["build", "test", "last-checks"]
}
}
},
Expand All @@ -22,31 +12,11 @@
"dependsOn": ["^build"],
"outputs": ["{projectRoot}/dist"]
},
"build:es": {
"dependsOn": ["^build:es"],
"outputs": ["{projectRoot}/dist"]
},
"build:js": {
"dependsOn": ["^build:js"],
"outputs": ["{projectRoot}/dist"]
},
"test": {
"dependsOn": ["^test"]
},
"test:tape": {
"dependsOn": ["^test:tape"]
},
"test:types": {
"dependsOn": ["^test:types"]
},
"last-checks": {
"dependsOn": ["^last-checks"]
},
"last-checks:example": {
"dependsOn": ["^last-checks:example"]
},
"last-checks:testjs": {
"dependsOn": ["^last-checks:testjs"]
}
}
}
15 changes: 8 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,19 @@
},
"devDependencies": {
"@types/geojson": "7946.0.8",
"@types/node": "^17.0.21",
"@typescript-eslint/eslint-plugin": "^4.8.0",
"@typescript-eslint/parser": "^4.8.0",
"@types/node": "18.11.9",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the intention to lock the version for this particular dependency? Just curious.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ran in to problems straying too far from this version. For example at time of committing 18.18.6 falls over. Could maybe loosen to patch ~ level updates, though want to understand more how the relationship works between this and whatever depends on it first.

"@typescript-eslint/eslint-plugin": "^6.8.0",
"@typescript-eslint/parser": "^6.8.0",
"acorn": "^7.4.1",
"camelcase": "*",
"d3-queue": "*",
"decamelize": "*",
"dependency-tree": "^8.1.2",
"documentation": "^14.0.2",
"es-check": "^7.1.1",
"eslint": "~7.13.0",
"eslint-config-prettier": "^6.15.0",
"eslint": "^8.51.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.1",
"esm": "^3.2.25",
"fs-extra": "*",
"husky": "^4.2.3",
Expand All @@ -60,13 +61,13 @@
"meow": "*",
"monorepolint": "^0.5.0-alpha.20",
"npm-run-all": "^4.1.5",
"prettier": "^2.1.2",
"prettier": "^3.0.3",
"progress": "*",
"rollup": "^2.34.2",
"tape": "^5.7.0",
"ts-node": "^9.0.0",
"tsx": "^3.12.8",
"typescript": "^3.8.3",
"typescript": "^5.2.2",
"yamljs": "*"
}
}
1 change: 0 additions & 1 deletion packages/turf-along/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*"
},
Expand Down
1 change: 0 additions & 1 deletion packages/turf-angle/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*",
"write-json-file": "*"
Expand Down
1 change: 0 additions & 1 deletion packages/turf-area/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*",
"write-json-file": "*"
Expand Down
2 changes: 1 addition & 1 deletion packages/turf-bbox-clip/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import { lineclip, polygonclip } from "./lib/lineclip";
*/
export default function bboxClip<
G extends Polygon | MultiPolygon | LineString | MultiLineString,
P = GeoJsonProperties
P extends GeoJsonProperties = GeoJsonProperties,
smallsaucepan marked this conversation as resolved.
Show resolved Hide resolved
>(feature: Feature<G, P> | G, bbox: BBox) {
const geom = getGeom(feature);
const type = geom.type;
Expand Down
1 change: 0 additions & 1 deletion packages/turf-bbox-clip/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*",
"write-json-file": "*"
Expand Down
4 changes: 3 additions & 1 deletion packages/turf-bbox-polygon/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ import { polygon, Id } from "@turf/helpers";
* //addToMap
* var addToMap = [poly]
*/
export default function bboxPolygon<P = GeoJsonProperties>(
export default function bboxPolygon<
P extends GeoJsonProperties = GeoJsonProperties,
>(
bbox: BBox,
options: {
properties?: P;
Expand Down
1 change: 0 additions & 1 deletion packages/turf-bbox-polygon/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
"benchmark": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*"
},
Expand Down
1 change: 0 additions & 1 deletion packages/turf-bbox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
"benchmark": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*"
},
Expand Down
1 change: 0 additions & 1 deletion packages/turf-bearing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
"benchmark": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*",
"write-json-file": "*"
Expand Down
2 changes: 1 addition & 1 deletion packages/turf-bezier-spline/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import Spline from "./lib/spline";
* var addToMap = [line, curved]
* curved.properties = { stroke: '#0F0' };
*/
function bezier<P = GeoJsonProperties>(
function bezier<P extends GeoJsonProperties = GeoJsonProperties>(
line: Feature<LineString> | LineString,
options: {
properties?: P;
Expand Down
1 change: 0 additions & 1 deletion packages/turf-bezier-spline/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*",
"write-json-file": "*"
Expand Down
1 change: 0 additions & 1 deletion packages/turf-boolean-clockwise/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*"
},
Expand Down
1 change: 0 additions & 1 deletion packages/turf-boolean-concave/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*"
},
Expand Down
1 change: 0 additions & 1 deletion packages/turf-boolean-contains/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*"
},
Expand Down
1 change: 0 additions & 1 deletion packages/turf-boolean-crosses/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*"
},
Expand Down
1 change: 0 additions & 1 deletion packages/turf-boolean-disjoint/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*"
},
Expand Down
1 change: 0 additions & 1 deletion packages/turf-boolean-equal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*"
},
Expand Down
1 change: 0 additions & 1 deletion packages/turf-boolean-intersects/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*"
},
Expand Down
1 change: 0 additions & 1 deletion packages/turf-boolean-overlap/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*"
},
Expand Down
1 change: 0 additions & 1 deletion packages/turf-boolean-parallel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*",
"write-json-file": "*"
Expand Down
2 changes: 1 addition & 1 deletion packages/turf-boolean-point-in-polygon/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import { getCoord, getGeom } from "@turf/invariant";
*/
export default function booleanPointInPolygon<
G extends Polygon | MultiPolygon,
P = GeoJsonProperties
P extends GeoJsonProperties = GeoJsonProperties,
>(
point: Coord,
polygon: Feature<G, P> | G,
Expand Down
1 change: 0 additions & 1 deletion packages/turf-boolean-point-in-polygon/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
"benchmark": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*"
},
Expand Down
1 change: 0 additions & 1 deletion packages/turf-boolean-point-on-line/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*",
"write-json-file": "*"
Expand Down
1 change: 0 additions & 1 deletion packages/turf-boolean-touches/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*"
},
Expand Down
1 change: 0 additions & 1 deletion packages/turf-boolean-valid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*"
},
Expand Down
1 change: 0 additions & 1 deletion packages/turf-boolean-within/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/turf-center-mean/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { isNumber, point, Id } from "@turf/helpers";
* mean.properties['marker-size'] = 'large';
* mean.properties['marker-color'] = '#000';
*/
function centerMean<P = GeoJsonProperties>(
function centerMean<P extends GeoJsonProperties = GeoJsonProperties>(
geojson: any, // To-Do include Typescript AllGeoJSON
options: { properties?: P; bbox?: BBox; id?: Id; weight?: string } = {}
): Feature<Point, P> {
Expand Down
1 change: 0 additions & 1 deletion packages/turf-center-mean/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*",
"write-json-file": "*"
Expand Down
1 change: 0 additions & 1 deletion packages/turf-center-median/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
"load-json-file": "*",
"npm-run-all": "*",
"tape": "*",
"tslint": "*",
"tsx": "*",
"typescript": "*",
"write-json-file": "*"
Expand Down
2 changes: 1 addition & 1 deletion packages/turf-center-of-mass/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { coordEach } from "@turf/meta";
* //addToMap
* var addToMap = [polygon, center]
*/
function centerOfMass<P = GeoJsonProperties>(
function centerOfMass<P extends GeoJsonProperties = GeoJsonProperties>(
geojson: any,
options: {
properties?: P;
Expand Down
Loading