Skip to content

Commit b3e146a

Browse files
committed
Update dependencies that had vulnerabilities
1 parent a0d7bc7 commit b3e146a

6 files changed

Lines changed: 2158 additions & 1641 deletions

File tree

babel.config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"presets": [
3+
["@babel/preset-env", { "targets": { "node": "current" } }]
4+
]
5+
}

jest.config.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,15 @@ export default {
1818
slowTestThreshold: 1,
1919
testEnvironment: "jsdom",
2020
testRunner: "jest-jasmine2",
21+
transform: {
22+
"\\.[jt]sx?$": ["babel-jest", { configFile: "<rootDir>/../../babel.config.json" }],
23+
},
24+
moduleNameMapper: {
25+
"^martinez-polygon-clipping$":
26+
"<rootDir>/../../node_modules/martinez-polygon-clipping/dist/martinez.js",
27+
},
28+
transformIgnorePatterns: [
29+
"node_modules/(?!(earcut|pbf|polylabel|tinyqueue|rbush|quickselect|martinez-polygon-clipping|splaytree|robust-predicates)/)",
30+
],
2131
watchman: false,
2232
};

package.json

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,44 +31,47 @@
3131
"last 2 versions"
3232
],
3333
"dependencies": {
34-
"@types/earcut": "^2.1.1",
35-
"@types/node": "^18.16.3",
34+
"@types/earcut": "^3.0.0",
35+
"@types/node": "^22.0.0",
3636
"@types/pako": "^2.0.0",
3737
"@types/pbf": "^3.0.2",
3838
"@types/polylabel": "^1.0.5",
39-
"@types/rbush": "^3.0.0",
39+
"@types/rbush": "^4.0.0",
4040
"@types/three": "^0.152.0",
4141
"@types/virtual-dom": "^2.1.1",
42-
"earcut": "^2.2.4",
43-
"martinez-polygon-clipping": "^0.7.3",
42+
"earcut": "^3.0.0",
43+
"martinez-polygon-clipping": "^0.8.0",
4444
"pako": "^2.1.0",
45-
"pbf": "^3.2.1",
46-
"polylabel": "^1.1.0",
47-
"rbush": "^3.0.1",
45+
"pbf": "^4.0.0",
46+
"polylabel": "^2.0.0",
47+
"rbush": "^4.0.0",
4848
"rxjs": "^7.8.1",
4949
"s2-geometry": "^1.2.10",
5050
"three": "0.152.2",
5151
"virtual-dom": "^2.1.1"
5252
},
5353
"devDependencies": {
54+
"@babel/preset-env": "^7.29.2",
5455
"@rollup/plugin-commonjs": "^24.1.0",
5556
"@rollup/plugin-node-resolve": "^15.0.2",
56-
"@types/jest": "^27.4.1",
57+
"@types/jest": "^29.0.0",
5758
"autoprefixer": "^10.4.14",
5859
"caniuse-lite": "^1.0.30001482",
59-
"concurrently": "^8.0.1",
60+
"concurrently": "^9.0.0",
6061
"express": "^4.18.2",
6162
"flowgen": "^1.21.0",
62-
"jest": "^27.5.1",
63+
"jest": "^29.0.0",
64+
"jest-environment-jsdom": "^30.3.0",
65+
"jest-jasmine2": "29.7.0",
6366
"postcss": "^8.4.23",
64-
"postcss-cli": "^10.1.0",
67+
"postcss-cli": "^11.0.0",
6568
"postcss-inline-svg": "^6.0.0",
6669
"rollup": "^3.21.4",
6770
"rollup-plugin-dts": "^5.3.0",
6871
"rollup-plugin-sourcemaps": "^0.6.3",
6972
"rollup-plugin-terser": "^7.0.2",
7073
"tslint": "^6.1.2",
71-
"typescript": "^4.9.5"
74+
"typescript": "^5.5.0"
7275
},
7376
"scripts": {
7477
"build": "yarn build-styles && yarn build-src",

src/component/tag/geometry/VertexGeometry.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import earcut from "earcut";
1+
import earcut, { flatten } from "earcut";
22
import polylabel from "polylabel";
33
import * as martinez from "martinez-polygon-clipping";
44
import * as THREE from "three";
@@ -204,7 +204,7 @@ export abstract class VertexGeometry extends Geometry {
204204
points = points.concat(hole3d.slice(0, -1));
205205
}
206206

207-
let flattened: { vertices: number[], holes: number[], dimensions: number; } = earcut.flatten(data);
207+
let flattened: { vertices: number[], holes: number[], dimensions: number; } = flatten(data);
208208
let indices: number[] = earcut(flattened.vertices, flattened.holes, flattened.dimensions);
209209
let triangles: number[] = [];
210210

@@ -299,7 +299,9 @@ export abstract class VertexGeometry extends Geometry {
299299
lookat2d: number[],
300300
transform: Transform): number[] {
301301

302-
const intersections: martinez.MultiPolygon = martinez.intersection([points2d, ...holes2d], [bbox2d]) as martinez.MultiPolygon;
302+
const intersections: martinez.MultiPolygon = martinez.intersection(
303+
[points2d as martinez.Ring, ...holes2d as martinez.Ring[]],
304+
[bbox2d as martinez.Ring]) as martinez.MultiPolygon;
303305
if (!intersections) {
304306
return [];
305307
}

src/viewer/Navigator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ export class Navigator {
219219
this._abortRequest("to reset");
220220

221221
return this._reset$()
222-
.pipe(map(() => undefined));
222+
.pipe(map((): void => undefined));
223223
}
224224

225225
public setFilter$(filter: FilterExpression): Observable<void> {

0 commit comments

Comments
 (0)