diff --git a/package-lock.json b/package-lock.json index 8fbcd71a9..156ba172e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -70,7 +70,7 @@ "redux-bundler": "^26.1.0", "redux-bundler-react": "^1.2.0", "tachyons": "^4.12.0", - "topojson": "^3.0.2", + "topojson-client": "^3.1.0", "uint8arrays": "2.1.2", "window-or-global": "^1.0.1" }, @@ -66977,33 +66977,10 @@ "url": "https://github.com/sponsors/Borewit" } }, - "node_modules/topojson": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/topojson/-/topojson-3.0.2.tgz", - "integrity": "sha512-u3zeuL6WEVL0dmsRn7uHZKc4Ao4gpW3sORUv+N3ezLTvY3JdCuyg0hvpWiIfFw8p/JwVN++SvAsFgcFEeR15rQ==", - "deprecated": "Use topojson-client, topojson-server or topojson-simplify directly.", - "dependencies": { - "topojson-client": "3.0.0", - "topojson-server": "3.0.0", - "topojson-simplify": "3.0.2" - }, - "bin": { - "geo2topo": "node_modules/topojson-server/bin/geo2topo", - "topo2geo": "node_modules/topojson-client/bin/topo2geo", - "topomerge": "node_modules/topojson-client/bin/topomerge", - "topoquantize": "node_modules/topojson-client/bin/topoquantize", - "toposimplify": "node_modules/topojson-simplify/bin/toposimplify" - } - }, - "node_modules/topojson/node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - }, - "node_modules/topojson/node_modules/topojson-client": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/topojson-client/-/topojson-client-3.0.0.tgz", - "integrity": "sha1-H5kpOnfvQqRI0DKoGqmCtz82DS8=", + "node_modules/topojson-client": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/topojson-client/-/topojson-client-3.1.0.tgz", + "integrity": "sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==", "dependencies": { "commander": "2" }, @@ -67013,28 +66990,10 @@ "topoquantize": "bin/topoquantize" } }, - "node_modules/topojson/node_modules/topojson-server": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/topojson-server/-/topojson-server-3.0.0.tgz", - "integrity": "sha1-N4546Hw5cqe1vixdYENptrrmnF4=", - "dependencies": { - "commander": "2" - }, - "bin": { - "geo2topo": "bin/geo2topo" - } - }, - "node_modules/topojson/node_modules/topojson-simplify": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/topojson-simplify/-/topojson-simplify-3.0.2.tgz", - "integrity": "sha512-gyYSVRt4jO/0RJXKZQPzTDQRWV+D/nOfiljNUv0HBXslFLtq3yxRHrl7jbrjdbda5Ytdr7M8BZUI4OxU7tnbRQ==", - "dependencies": { - "commander": "2", - "topojson-client": "3" - }, - "bin": { - "toposimplify": "bin/toposimplify" - } + "node_modules/topojson-client/node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, "node_modules/tough-cookie": { "version": "2.5.0", @@ -121139,45 +121098,18 @@ "ieee754": "^1.2.1" } }, - "topojson": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/topojson/-/topojson-3.0.2.tgz", - "integrity": "sha512-u3zeuL6WEVL0dmsRn7uHZKc4Ao4gpW3sORUv+N3ezLTvY3JdCuyg0hvpWiIfFw8p/JwVN++SvAsFgcFEeR15rQ==", + "topojson-client": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/topojson-client/-/topojson-client-3.1.0.tgz", + "integrity": "sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==", "requires": { - "topojson-client": "3.0.0", - "topojson-server": "3.0.0", - "topojson-simplify": "3.0.2" + "commander": "2" }, "dependencies": { "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - }, - "topojson-client": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/topojson-client/-/topojson-client-3.0.0.tgz", - "integrity": "sha1-H5kpOnfvQqRI0DKoGqmCtz82DS8=", - "requires": { - "commander": "2" - } - }, - "topojson-server": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/topojson-server/-/topojson-server-3.0.0.tgz", - "integrity": "sha1-N4546Hw5cqe1vixdYENptrrmnF4=", - "requires": { - "commander": "2" - } - }, - "topojson-simplify": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/topojson-simplify/-/topojson-simplify-3.0.2.tgz", - "integrity": "sha512-gyYSVRt4jO/0RJXKZQPzTDQRWV+D/nOfiljNUv0HBXslFLtq3yxRHrl7jbrjdbda5Ytdr7M8BZUI4OxU7tnbRQ==", - "requires": { - "commander": "2", - "topojson-client": "3" - } } } }, diff --git a/package.json b/package.json index ccec2253f..1f0d5f96d 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "redux-bundler": "^26.1.0", "redux-bundler-react": "^1.2.0", "tachyons": "^4.12.0", - "topojson": "^3.0.2", + "topojson-client": "^3.1.0", "uint8arrays": "2.1.2", "window-or-global": "^1.0.1" }, diff --git a/src/peers/WorldMap/Map.js b/src/peers/WorldMap/Map.js index 546cdd6ac..236ba69b3 100644 --- a/src/peers/WorldMap/Map.js +++ b/src/peers/WorldMap/Map.js @@ -1,5 +1,5 @@ import * as d3 from 'd3' -import * as topojson from 'topojson' +import * as topojson from 'topojson-client' import ReactFauxDOM from 'react-faux-dom' import worldData from './world.json'