summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbhijith Sheheer <abhijithsheheer@gmail.com>2019-12-08 22:22:05 +0530
committerAbhijith Sheheer <abhijithsheheer@gmail.com>2019-12-08 22:22:05 +0530
commit63ccbc34412de8569d11da2632e489f894f6ac32 (patch)
tree3f649507ee6cfef3421b43e94bea6f98525b2a4a
parenta5ce7833f7f2d4661e4d46a5ac598a1625ac24b3 (diff)
parent135260ac27efe9cd9a6cfbe21405af7da3c12733 (diff)
Update upstream source from tag 'upstream/1.11.9'
Update to upstream version '1.11.9' with Debian dir d2aad9fe67bd4de16414fcdd6d920149a3000f9f
-rw-r--r--.eslintrc.json11
-rw-r--r--.npmignore4
-rw-r--r--package.json17
-rw-r--r--src/area.js8
-rw-r--r--src/bounds.js10
-rw-r--r--src/cartesian.js2
-rw-r--r--src/centroid.js6
-rw-r--r--src/circle.js8
-rw-r--r--src/clip/antimeridian.js4
-rw-r--r--src/clip/buffer.js2
-rw-r--r--src/clip/circle.js10
-rw-r--r--src/clip/extent.js2
-rw-r--r--src/clip/index.js8
-rw-r--r--src/clip/rectangle.js8
-rw-r--r--src/clip/rejoin.js2
-rw-r--r--src/contains.js6
-rw-r--r--src/distance.js2
-rw-r--r--src/graticule.js2
-rw-r--r--src/index.js68
-rw-r--r--src/interpolate.js2
-rw-r--r--src/length.js8
-rw-r--r--src/path/area.js6
-rw-r--r--src/path/bounds.js2
-rw-r--r--src/path/centroid.js2
-rw-r--r--src/path/context.js4
-rw-r--r--src/path/index.js16
-rw-r--r--src/path/measure.js6
-rw-r--r--src/pointEqual.js2
-rw-r--r--src/polygonContains.js6
-rw-r--r--src/projection/albers.js2
-rw-r--r--src/projection/albersUsa.js8
-rw-r--r--src/projection/azimuthal.js2
-rw-r--r--src/projection/azimuthalEqualArea.js6
-rw-r--r--src/projection/azimuthalEquidistant.js6
-rw-r--r--src/projection/conic.js4
-rw-r--r--src/projection/conicConformal.js6
-rw-r--r--src/projection/conicEqualArea.js6
-rw-r--r--src/projection/conicEquidistant.js6
-rw-r--r--src/projection/cylindricalEqualArea.js2
-rw-r--r--src/projection/equirectangular.js2
-rw-r--r--src/projection/fit.js4
-rw-r--r--src/projection/gnomonic.js6
-rw-r--r--src/projection/identity.js8
-rw-r--r--src/projection/index.js20
-rw-r--r--src/projection/mercator.js6
-rw-r--r--src/projection/naturalEarth1.js4
-rw-r--r--src/projection/orthographic.js6
-rw-r--r--src/projection/resample.js6
-rw-r--r--src/projection/stereographic.js6
-rw-r--r--src/projection/transverseMercator.js4
-rw-r--r--src/rotation.js4
-rw-r--r--test/polygonContains-test.js524
-rw-r--r--test/projection/transverseMercator-test.js2
-rw-r--r--yarn.lock909
54 files changed, 983 insertions, 810 deletions
diff --git a/.eslintrc.json b/.eslintrc.json
index d3004e4..48730c9 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,5 +1,11 @@
{
- "extends": "eslint:recommended",
+ "extends": [
+ "eslint:recommended",
+ "plugin:es5/no-es2016"
+ ],
+ "plugins": [
+ "es5"
+ ],
"parserOptions": {
"sourceType": "module",
"ecmaVersion": 8
@@ -11,6 +17,7 @@
},
"rules": {
"no-cond-assign": 0,
- "no-constant-condition": 0
+ "no-constant-condition": 0,
+ "no-prototype-builtins": 0
}
}
diff --git a/.npmignore b/.npmignore
deleted file mode 100644
index 0de69fc..0000000
--- a/.npmignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.sublime-*
-dist/*.zip
-img/
-test/
diff --git a/package.json b/package.json
index 11588f4..32f2bc8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "d3-geo",
- "version": "1.11.6",
+ "version": "1.11.9",
"description": "Shapes and calculators for spherical coordinates.",
"keywords": [
"d3",
@@ -23,21 +23,28 @@
"type": "git",
"url": "https://github.com/d3/d3-geo.git"
},
+ "files": [
+ "dist/**/*.js",
+ "src/**/*.js"
+ ],
"scripts": {
"pretest": "rollup -c",
- "test": "tape 'test/**/*-test.js' && eslint src",
+ "test": "tape -r esm 'test/**/*-test.js' && eslint src",
"prepublishOnly": "rm -rf dist && yarn test && mkdir -p test/output && test/compare-images",
"postpublish": "git push && git push --tags && cd ../d3.github.com && git pull && cp ../${npm_package_name}/dist/${npm_package_name}.js ${npm_package_name}.v${npm_package_version%%.*}.js && cp ../${npm_package_name}/dist/${npm_package_name}.min.js ${npm_package_name}.v${npm_package_version%%.*}.min.js && git add ${npm_package_name}.v${npm_package_version%%.*}.js ${npm_package_name}.v${npm_package_version%%.*}.min.js && git commit -m \"${npm_package_name} ${npm_package_version}\" && git push && cd - && zip -j dist/${npm_package_name}.zip -- LICENSE README.md dist/${npm_package_name}.js dist/${npm_package_name}.min.js"
},
"dependencies": {
"d3-array": "1"
},
+ "sideEffects": false,
"devDependencies": {
"canvas": "1",
"d3-format": "1",
- "eslint": "5",
- "rollup": "0.64",
- "rollup-plugin-terser": "1",
+ "eslint": "6",
+ "eslint-plugin-es5": "1",
+ "esm": "3",
+ "rollup": "1",
+ "rollup-plugin-terser": "5",
"tape": "4",
"topojson-client": "3",
"world-atlas": "1"
diff --git a/src/area.js b/src/area.js
index e7e2597..6336dac 100644
--- a/src/area.js
+++ b/src/area.js
@@ -1,7 +1,7 @@
-import adder from "./adder";
-import {atan2, cos, quarterPi, radians, sin, tau} from "./math";
-import noop from "./noop";
-import stream from "./stream";
+import adder from "./adder.js";
+import {atan2, cos, quarterPi, radians, sin, tau} from "./math.js";
+import noop from "./noop.js";
+import stream from "./stream.js";
export var areaRingSum = adder();
diff --git a/src/bounds.js b/src/bounds.js
index 5defb99..6935b97 100644
--- a/src/bounds.js
+++ b/src/bounds.js
@@ -1,8 +1,8 @@
-import adder from "./adder";
-import {areaStream, areaRingSum} from "./area";
-import {cartesian, cartesianCross, cartesianNormalizeInPlace, spherical} from "./cartesian";
-import {abs, degrees, epsilon, radians} from "./math";
-import stream from "./stream";
+import adder from "./adder.js";
+import {areaStream, areaRingSum} from "./area.js";
+import {cartesian, cartesianCross, cartesianNormalizeInPlace, spherical} from "./cartesian.js";
+import {abs, degrees, epsilon, radians} from "./math.js";
+import stream from "./stream.js";
var lambda0, phi0, lambda1, phi1, // bounds
lambda2, // previous lambda-coordinate
diff --git a/src/cartesian.js b/src/cartesian.js
index 2526fa8..73790a6 100644
--- a/src/cartesian.js
+++ b/src/cartesian.js
@@ -1,4 +1,4 @@
-import {asin, atan2, cos, sin, sqrt} from "./math";
+import {asin, atan2, cos, sin, sqrt} from "./math.js";
export function spherical(cartesian) {
return [atan2(cartesian[1], cartesian[0]), asin(cartesian[2])];
diff --git a/src/centroid.js b/src/centroid.js
index 37a924c..e509298 100644
--- a/src/centroid.js
+++ b/src/centroid.js
@@ -1,6 +1,6 @@
-import {asin, atan2, cos, degrees, epsilon, epsilon2, radians, sin, sqrt} from "./math";
-import noop from "./noop";
-import stream from "./stream";
+import {asin, atan2, cos, degrees, epsilon, epsilon2, radians, sin, sqrt} from "./math.js";
+import noop from "./noop.js";
+import stream from "./stream.js";
var W0, W1,
X0, Y0, Z0,
diff --git a/src/circle.js b/src/circle.js
index 9dbdbef..85a0af9 100644
--- a/src/circle.js
+++ b/src/circle.js
@@ -1,7 +1,7 @@
-import {cartesian, cartesianNormalizeInPlace, spherical} from "./cartesian";
-import constant from "./constant";
-import {acos, cos, degrees, epsilon, radians, sin, tau} from "./math";
-import {rotateRadians} from "./rotation";
+import {cartesian, cartesianNormalizeInPlace, spherical} from "./cartesian.js";
+import constant from "./constant.js";
+import {acos, cos, degrees, epsilon, radians, sin, tau} from "./math.js";
+import {rotateRadians} from "./rotation.js";
// Generates a circle centered at [0°, 0°], with a given radius and precision.
export function circleStream(stream, radius, delta, direction, t0, t1) {
diff --git a/src/clip/antimeridian.js b/src/clip/antimeridian.js
index 41b5ced..7ed32d4 100644
--- a/src/clip/antimeridian.js
+++ b/src/clip/antimeridian.js
@@ -1,5 +1,5 @@
-import clip from "./index";
-import {abs, atan, cos, epsilon, halfPi, pi, sin} from "../math";
+import clip from "./index.js";
+import {abs, atan, cos, epsilon, halfPi, pi, sin} from "../math.js";
export default clip(
function() { return true; },
diff --git a/src/clip/buffer.js b/src/clip/buffer.js
index 0cb6b91..d39eb20 100644
--- a/src/clip/buffer.js
+++ b/src/clip/buffer.js
@@ -1,4 +1,4 @@
-import noop from "../noop";
+import noop from "../noop.js";
export default function() {
var lines = [],
diff --git a/src/clip/circle.js b/src/clip/circle.js
index bac77e8..9695d4b 100644
--- a/src/clip/circle.js
+++ b/src/clip/circle.js
@@ -1,8 +1,8 @@
-import {cartesian, cartesianAddInPlace, cartesianCross, cartesianDot, cartesianScale, spherical} from "../cartesian";
-import {circleStream} from "../circle";
-import {abs, cos, epsilon, pi, radians, sqrt} from "../math";
-import pointEqual from "../pointEqual";
-import clip from "./index";
+import {cartesian, cartesianAddInPlace, cartesianCross, cartesianDot, cartesianScale, spherical} from "../cartesian.js";
+import {circleStream} from "../circle.js";
+import {abs, cos, epsilon, pi, radians, sqrt} from "../math.js";
+import pointEqual from "../pointEqual.js";
+import clip from "./index.js";
export default function(radius) {
var cr = cos(radius),
diff --git a/src/clip/extent.js b/src/clip/extent.js
index ca09032..5ff06ee 100644
--- a/src/clip/extent.js
+++ b/src/clip/extent.js
@@ -1,4 +1,4 @@
-import clipRectangle from "./rectangle";
+import clipRectangle from "./rectangle.js";
export default function() {
var x0 = 0,
diff --git a/src/clip/index.js b/src/clip/index.js
index ca17cd7..af7ac91 100644
--- a/src/clip/index.js
+++ b/src/clip/index.js
@@ -1,7 +1,7 @@
-import clipBuffer from "./buffer";
-import clipRejoin from "./rejoin";
-import {epsilon, halfPi} from "../math";
-import polygonContains from "../polygonContains";
+import clipBuffer from "./buffer.js";
+import clipRejoin from "./rejoin.js";
+import {epsilon, halfPi} from "../math.js";
+import polygonContains from "../polygonContains.js";
import {merge} from "d3-array";
export default function(pointVisible, clipLine, interpolate, start) {
diff --git a/src/clip/rectangle.js b/src/clip/rectangle.js
index ceab1c4..4767626 100644
--- a/src/clip/rectangle.js
+++ b/src/clip/rectangle.js
@@ -1,7 +1,7 @@
-import {abs, epsilon} from "../math";
-import clipBuffer from "./buffer";
-import clipLine from "./line";
-import clipRejoin from "./rejoin";
+import {abs, epsilon} from "../math.js";
+import clipBuffer from "./buffer.js";
+import clipLine from "./line.js";
+import clipRejoin from "./rejoin.js";
import {merge} from "d3-array";
var clipMax = 1e9, clipMin = -clipMax;
diff --git a/src/clip/rejoin.js b/src/clip/rejoin.js
index dc42516..645fbe3 100644
--- a/src/clip/rejoin.js
+++ b/src/clip/rejoin.js
@@ -1,4 +1,4 @@
-import pointEqual from "../pointEqual";
+import pointEqual from "../pointEqual.js";
function Intersection(point, points, other, entry) {
this.x = point;
diff --git a/src/contains.js b/src/contains.js
index 3b8e0c8..923f4d4 100644
--- a/src/contains.js
+++ b/src/contains.js
@@ -1,6 +1,6 @@
-import {default as polygonContains} from "./polygonContains";
-import {default as distance} from "./distance";
-import {epsilon2, radians} from "./math";
+import {default as polygonContains} from "./polygonContains.js";
+import {default as distance} from "./distance.js";
+import {epsilon2, radians} from "./math.js";
var containsObjectType = {
Feature: function(object, point) {
diff --git a/src/distance.js b/src/distance.js
index 654472f..0cd23db 100644
--- a/src/distance.js
+++ b/src/distance.js
@@ -1,4 +1,4 @@
-import length from "./length";
+import length from "./length.js";
var coordinates = [null, null],
object = {type: "LineString", coordinates: coordinates};
diff --git a/src/graticule.js b/src/graticule.js
index ce0f2bd..dc8daaf 100644
--- a/src/graticule.js
+++ b/src/graticule.js
@@ -1,5 +1,5 @@
import {range} from "d3-array";
-import {abs, ceil, epsilon} from "./math";
+import {abs, ceil, epsilon} from "./math.js";
function graticuleX(y0, y1, dy) {
var y = range(y0, y1 - epsilon, dy).concat(y1);
diff --git a/src/index.js b/src/index.js
index d8253c9..9a36976 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,34 +1,34 @@
-export {default as geoArea} from "./area";
-export {default as geoBounds} from "./bounds";
-export {default as geoCentroid} from "./centroid";
-export {default as geoCircle} from "./circle";
-export {default as geoClipAntimeridian} from "./clip/antimeridian";
-export {default as geoClipCircle} from "./clip/circle";
-export {default as geoClipExtent} from "./clip/extent"; // DEPRECATED! Use d3.geoIdentity().clipExtent(…).
-export {default as geoClipRectangle} from "./clip/rectangle";
-export {default as geoContains} from "./contains";
-export {default as geoDistance} from "./distance";
-export {default as geoGraticule, graticule10 as geoGraticule10} from "./graticule";
-export {default as geoInterpolate} from "./interpolate";
-export {default as geoLength} from "./length";
-export {default as geoPath} from "./path/index";
-export {default as geoAlbers} from "./projection/albers";
-export {default as geoAlbersUsa} from "./projection/albersUsa";
-export {default as geoAzimuthalEqualArea, azimuthalEqualAreaRaw as geoAzimuthalEqualAreaRaw} from "./projection/azimuthalEqualArea";
-export {default as geoAzimuthalEquidistant, azimuthalEquidistantRaw as geoAzimuthalEquidistantRaw} from "./projection/azimuthalEquidistant";
-export {default as geoConicConformal, conicConformalRaw as geoConicConformalRaw} from "./projection/conicConformal";
-export {default as geoConicEqualArea, conicEqualAreaRaw as geoConicEqualAreaRaw} from "./projection/conicEqualArea";
-export {default as geoConicEquidistant, conicEquidistantRaw as geoConicEquidistantRaw} from "./projection/conicEquidistant";
-export {default as geoEqualEarth, equalEarthRaw as geoEqualEarthRaw} from "./projection/equalEarth";
-export {default as geoEquirectangular, equirectangularRaw as geoEquirectangularRaw} from "./projection/equirectangular";
-export {default as geoGnomonic, gnomonicRaw as geoGnomonicRaw} from "./projection/gnomonic";
-export {default as geoIdentity} from "./projection/identity";
-export {default as geoProjection, projectionMutator as geoProjectionMutator} from "./projection/index";
-export {default as geoMercator, mercatorRaw as geoMercatorRaw} from "./projection/mercator";
-export {default as geoNaturalEarth1, naturalEarth1Raw as geoNaturalEarth1Raw} from "./projection/naturalEarth1";
-export {default as geoOrthographic, orthographicRaw as geoOrthographicRaw} from "./projection/orthographic";
-export {default as geoStereographic, stereographicRaw as geoStereographicRaw} from "./projection/stereographic";
-export {default as geoTransverseMercator, transverseMercatorRaw as geoTransverseMercatorRaw} from "./projection/transverseMercator";
-export {default as geoRotation} from "./rotation";
-export {default as geoStream} from "./stream";
-export {default as geoTransform} from "./transform";
+export {default as geoArea} from "./area.js";
+export {default as geoBounds} from "./bounds.js";
+export {default as geoCentroid} from "./centroid.js";
+export {default as geoCircle} from "./circle.js";
+export {default as geoClipAntimeridian} from "./clip/antimeridian.js";
+export {default as geoClipCircle} from "./clip/circle.js";
+export {default as geoClipExtent} from "./clip/extent.js"; // DEPRECATED! Use d3.geoIdentity().clipExtent(…).
+export {default as geoClipRectangle} from "./clip/rectangle.js";
+export {default as geoContains} from "./contains.js";
+export {default as geoDistance} from "./distance.js";
+export {default as geoGraticule, graticule10 as geoGraticule10} from "./graticule.js";
+export {default as geoInterpolate} from "./interpolate.js";
+export {default as geoLength} from "./length.js";
+export {default as geoPath} from "./path/index.js";
+export {default as geoAlbers} from "./projection/albers.js";
+export {default as geoAlbersUsa} from "./projection/albersUsa.js";
+export {default as geoAzimuthalEqualArea, azimuthalEqualAreaRaw as geoAzimuthalEqualAreaRaw} from "./projection/azimuthalEqualArea.js";
+export {default as geoAzimuthalEquidistant, azimuthalEquidistantRaw as geoAzimuthalEquidistantRaw} from "./projection/azimuthalEquidistant.js";
+export {default as geoConicConformal, conicConformalRaw as geoConicConformalRaw} from "./projection/conicConformal.js";
+export {default as geoConicEqualArea, conicEqualAreaRaw as geoConicEqualAreaRaw} from "./projection/conicEqualArea.js";
+export {default as geoConicEquidistant, conicEquidistantRaw as geoConicEquidistantRaw} from "./projection/conicEquidistant.js";
+export {default as geoEqualEarth, equalEarthRaw as geoEqualEarthRaw} from "./projection/equalEarth.js";
+export {default as geoEquirectangular, equirectangularRaw as geoEquirectangularRaw} from "./projection/equirectangular.js";
+export {default as geoGnomonic, gnomonicRaw as geoGnomonicRaw} from "./projection/gnomonic.js";
+export {default as geoIdentity} from "./projection/identity.js";
+export {default as geoProjection, projectionMutator as geoProjectionMutator} from "./projection/index.js";
+export {default as geoMercator, mercatorRaw as geoMercatorRaw} from "./projection/mercator.js";
+export {default as geoNaturalEarth1, naturalEarth1Raw as geoNaturalEarth1Raw} from "./projection/naturalEarth1.js";
+export {default as geoOrthographic, orthographicRaw as geoOrthographicRaw} from "./projection/orthographic.js";
+export {default as geoStereographic, stereographicRaw as geoStereographicRaw} from "./projection/stereographic.js";
+export {default as geoTransverseMercator, transverseMercatorRaw as geoTransverseMercatorRaw} from "./projection/transverseMercator.js";
+export {default as geoRotation} from "./rotation.js";
+export {default as geoStream} from "./stream.js";
+export {default as geoTransform} from "./transform.js";
diff --git a/src/interpolate.js b/src/interpolate.js
index 748ff3d..b19fbba 100644
--- a/src/interpolate.js
+++ b/src/interpolate.js
@@ -1,4 +1,4 @@
-import {asin, atan2, cos, degrees, haversin, radians, sin, sqrt} from "./math";
+import {asin, atan2, cos, degrees, haversin, radians, sin, sqrt} from "./math.js";
export default function(a, b) {
var x0 = a[0] * radians,
diff --git a/src/length.js b/src/length.js
index 5db115b..9329369 100644
--- a/src/length.js
+++ b/src/length.js
@@ -1,7 +1,7 @@
-import adder from "./adder";
-import {abs, atan2, cos, radians, sin, sqrt} from "./math";
-import noop from "./noop";
-import stream from "./stream";
+import adder from "./adder.js";
+import {abs, atan2, cos, radians, sin, sqrt} from "./math.js";
+import noop from "./noop.js";
+import stream from "./stream.js";
var lengthSum = adder(),
lambda0,
diff --git a/src/path/area.js b/src/path/area.js
index 27d95b6..f9944ff 100644
--- a/src/path/area.js
+++ b/src/path/area.js
@@ -1,6 +1,6 @@
-import adder from "../adder";
-import {abs} from "../math";
-import noop from "../noop";
+import adder from "../adder.js";
+import {abs} from "../math.js";
+import noop from "../noop.js";
var areaSum = adder(),
areaRingSum = adder(),
diff --git a/src/path/bounds.js b/src/path/bounds.js
index 734926f..0c83258 100644
--- a/src/path/bounds.js
+++ b/src/path/bounds.js
@@ -1,4 +1,4 @@
-import noop from "../noop";
+import noop from "../noop.js";
var x0 = Infinity,
y0 = x0,
diff --git a/src/path/centroid.js b/src/path/centroid.js
index 74a0f2e..852ef76 100644
--- a/src/path/centroid.js
+++ b/src/path/centroid.js
@@ -1,4 +1,4 @@
-import {sqrt} from "../math";
+import {sqrt} from "../math.js";
// TODO Enforce positive area for exterior, negative area for interior?
diff --git a/src/path/context.js b/src/path/context.js
index f8caa87..5137fc9 100644
--- a/src/path/context.js
+++ b/src/path/context.js
@@ -1,5 +1,5 @@
-import {tau} from "../math";
-import noop from "../noop";
+import {tau} from "../math.js";
+import noop from "../noop.js";
export default function PathContext(context) {
this._context = context;
diff --git a/src/path/index.js b/src/path/index.js
index 8140254..45da305 100644
--- a/src/path/index.js
+++ b/src/path/index.js
@@ -1,11 +1,11 @@
-import identity from "../identity";
-import stream from "../stream";
-import pathArea from "./area";
-import pathBounds from "./bounds";
-import pathCentroid from "./centroid";
-import PathContext from "./context";
-import pathMeasure from "./measure";
-import PathString from "./string";
+import identity from "../identity.js";
+import stream from "../stream.js";
+import pathArea from "./area.js";
+import pathBounds from "./bounds.js";
+import pathCentroid from "./centroid.js";
+import PathContext from "./context.js";
+import pathMeasure from "./measure.js";
+import PathString from "./string.js";
export default function(projection, context) {
var pointRadius = 4.5,
diff --git a/src/path/measure.js b/src/path/measure.js
index 9054a24..725a54d 100644
--- a/src/path/measure.js
+++ b/src/path/measure.js
@@ -1,6 +1,6 @@
-import adder from "../adder";
-import {sqrt} from "../math";
-import noop from "../noop";
+import adder from "../adder.js";
+import {sqrt} from "../math.js";
+import noop from "../noop.js";
var lengthSum = adder(),
lengthRing,
diff --git a/src/pointEqual.js b/src/pointEqual.js
index 00530d4..d25aa11 100644
--- a/src/pointEqual.js
+++ b/src/pointEqual.js
@@ -1,4 +1,4 @@
-import {abs, epsilon} from "./math";
+import {abs, epsilon} from "./math.js";
export default function(a, b) {
return abs(a[0] - b[0]) < epsilon && abs(a[1] - b[1]) < epsilon;
diff --git a/src/polygonContains.js b/src/polygonContains.js
index b666cfb..f1688d0 100644
--- a/src/polygonContains.js
+++ b/src/polygonContains.js
@@ -1,6 +1,6 @@
-import adder from "./adder";
-import {cartesian, cartesianCross, cartesianNormalizeInPlace} from "./cartesian";
-import {abs, asin, atan2, cos, epsilon, halfPi, pi, quarterPi, sign, sin, tau} from "./math";
+import adder from "./adder.js";
+import {cartesian, cartesianCross, cartesianNormalizeInPlace} from "./cartesian.js";
+import {abs, asin, atan2, cos, epsilon, halfPi, pi, quarterPi, sign, sin, tau} from "./math.js";
var sum = adder();
diff --git a/src/projection/albers.js b/src/projection/albers.js
index 69ffcc1..180425d 100644
--- a/src/projection/albers.js
+++ b/src/projection/albers.js
@@ -1,4 +1,4 @@
-import conicEqualArea from "./conicEqualArea";
+import conicEqualArea from "./conicEqualArea.js";
export default function() {
return conicEqualArea()
diff --git a/src/projection/albersUsa.js b/src/projection/albersUsa.js
index cd61ff7..fd295ed 100644
--- a/src/projection/albersUsa.js
+++ b/src/projection/albersUsa.js
@@ -1,7 +1,7 @@
-import {epsilon} from "../math";
-import albers from "./albers";
-import conicEqualArea from "./conicEqualArea";
-import {fitExtent, fitSize, fitWidth, fitHeight} from "./fit";
+import {epsilon} from "../math.js";
+import albers from "./albers.js";
+import conicEqualArea from "./conicEqualArea.js";
+import {fitExtent, fitSize, fitWidth, fitHeight} from "./fit.js";
// The projections must have mutually exclusive clip regions on the sphere,
// as this will avoid emitting interleaving lines and polygons.
diff --git a/src/projection/azimuthal.js b/src/projection/azimuthal.js
index d409ff8..94ebb9b 100644
--- a/src/projection/azimuthal.js
+++ b/src/projection/azimuthal.js
@@ -1,4 +1,4 @@
-import {asin, atan2, cos, sin, sqrt} from "../math";
+import {asin, atan2, cos, sin, sqrt} from "../math.js";
export function azimuthalRaw(scale) {
return function(x, y) {
diff --git a/src/projection/azimuthalEqualArea.js b/src/projection/azimuthalEqualArea.js
index 666f50f..795d4c7 100644
--- a/src/projection/azimuthalEqualArea.js
+++ b/src/projection/azimuthalEqualArea.js
@@ -1,6 +1,6 @@
-import {asin, sqrt} from "../math";
-import {azimuthalRaw, azimuthalInvert} from "./azimuthal";
-import projection from "./index";
+import {asin, sqrt} from "../math.js";
+import {azimuthalRaw, azimuthalInvert} from "./azimuthal.js";
+import projection from "./index.js";
export var azimuthalEqualAreaRaw = azimuthalRaw(function(cxcy) {
return sqrt(2 / (1 + cxcy));
diff --git a/src/projection/azimuthalEquidistant.js b/src/projection/azimuthalEquidistant.js
index c95df42..9b89eb9 100644
--- a/src/projection/azimuthalEquidistant.js
+++ b/src/projection/azimuthalEquidistant.js
@@ -1,6 +1,6 @@
-import {acos, sin} from "../math";
-import {azimuthalRaw, azimuthalInvert} from "./azimuthal";
-import projection from "./index";
+import {acos, sin} from "../math.js";
+import {azimuthalRaw, azimuthalInvert} from "./azimuthal.js";
+import projection from "./index.js";
export var azimuthalEquidistantRaw = azimuthalRaw(function(c) {
return (c = acos(c)) && c / sin(c);
diff --git a/src/projection/conic.js b/src/projection/conic.js
index 3189013..81c5744 100644
--- a/src/projection/conic.js
+++ b/src/projection/conic.js
@@ -1,5 +1,5 @@
-import {degrees, pi, radians} from "../math";
-import {projectionMutator} from "./index";
+import {degrees, pi, radians} from "../math.js";
+import {projectionMutator} from "./index.js";
export function conicProjection(projectAt) {
var phi0 = 0,
diff --git a/src/projection/conicConformal.js b/src/projection/conicConformal.js
index 968a368..dc82e61 100644
--- a/src/projection/conicConformal.js
+++ b/src/projection/conicConformal.js
@@ -1,6 +1,6 @@
-import {abs, atan, atan2, cos, epsilon, halfPi, log, pow, sign, sin, sqrt, tan} from "../math";
-import {conicProjection} from "./conic";
-import {mercatorRaw} from "./mercator";
+import {abs, atan, atan2, cos, epsilon, halfPi, log, pow, sign, sin, sqrt, tan} from "../math.js";
+import {conicProjection} from "./conic.js";
+import {mercatorRaw} from "./mercator.js";
function tany(y) {
return tan((halfPi + y) / 2);
diff --git a/src/projection/conicEqualArea.js b/src/projection/conicEqualArea.js
index c408bb1..016bc2b 100644
--- a/src/projection/conicEqualArea.js
+++ b/src/projection/conicEqualArea.js
@@ -1,6 +1,6 @@
-import {abs, asin, atan2, cos, epsilon, sign, sin, sqrt} from "../math";
-import {conicProjection} from "./conic";
-import {cylindricalEqualAreaRaw} from "./cylindricalEqualArea";
+import {abs, asin, atan2, cos, epsilon, sign, sin, sqrt} from "../math.js";
+import {conicProjection} from "./conic.js";
+import {cylindricalEqualAreaRaw} from "./cylindricalEqualArea.js";
export function conicEqualAreaRaw(y0, y1) {
var sy0 = sin(y0), n = (sy0 + sin(y1)) / 2;
diff --git a/src/projection/conicEquidistant.js b/src/projection/conicEquidistant.js
index 7a5c31a..fc34537 100644
--- a/src/projection/conicEquidistant.js
+++ b/src/projection/conicEquidistant.js
@@ -1,6 +1,6 @@
-import {abs, atan2, cos, epsilon, sign, sin, sqrt} from "../math";
-import {conicProjection} from "./conic";
-import {equirectangularRaw} from "./equirectangular";
+import {abs, atan2, cos, epsilon, sign, sin, sqrt} from "../math.js";
+import {conicProjection} from "./conic.js";
+import {equirectangularRaw} from "./equirectangular.js";
export function conicEquidistantRaw(y0, y1) {
var cy0 = cos(y0),
diff --git a/src/projection/cylindricalEqualArea.js b/src/projection/cylindricalEqualArea.js
index 3074818..1d38b40 100644
--- a/src/projection/cylindricalEqualArea.js
+++ b/src/projection/cylindricalEqualArea.js
@@ -1,4 +1,4 @@
-import {asin, cos, sin} from "../math";
+import {asin, cos, sin} from "../math.js";
export function cylindricalEqualAreaRaw(phi0) {
var cosPhi0 = cos(phi0);
diff --git a/src/projection/equirectangular.js b/src/projection/equirectangular.js
index 429b8e9..d47065c 100644
--- a/src/projection/equirectangular.js
+++ b/src/projection/equirectangular.js
@@ -1,4 +1,4 @@
-import projection from "./index";
+import projection from "./index.js";
export function equirectangularRaw(lambda, phi) {
return [lambda, phi];
diff --git a/src/projection/fit.js b/src/projection/fit.js
index 6931839..d496d0f 100644
--- a/src/projection/fit.js
+++ b/src/projection/fit.js
@@ -1,5 +1,5 @@
-import {default as geoStream} from "../stream";
-import boundsStream from "../path/bounds";
+import {default as geoStream} from "../stream.js";
+import boundsStream from "../path/bounds.js";
function fit(projection, fitBounds, object) {
var clip = projection.clipExtent && projection.clipExtent();
diff --git a/src/projection/gnomonic.js b/src/projection/gnomonic.js
index 026f18e..5da1cc7 100644
--- a/src/projection/gnomonic.js
+++ b/src/projection/gnomonic.js
@@ -1,6 +1,6 @@
-import {atan, cos, sin} from "../math";
-import {azimuthalInvert} from "./azimuthal";
-import projection from "./index";
+import {atan, cos, sin} from "../math.js";
+import {azimuthalInvert} from "./azimuthal.js";
+import projection from "./index.js";
export function gnomonicRaw(x, y) {
var cy = cos(y), k = cos(x) * cy;
diff --git a/src/projection/identity.js b/src/projection/identity.js
index b9bb856..33f356c 100644
--- a/src/projection/identity.js
+++ b/src/projection/identity.js
@@ -1,7 +1,7 @@
-import clipRectangle from "../clip/rectangle";
-import identity from "../identity";
-import {transformer} from "../transform";
-import {fitExtent, fitSize, fitWidth, fitHeight} from "./fit";
+import clipRectangle from "../clip/rectangle.js";
+import identity from "../identity.js";
+import {transformer} from "../transform.js";
+import {fitExtent, fitSize, fitWidth, fitHeight} from "./fit.js";
function scaleTranslate(kx, ky, tx, ty) {
return kx === 1 && ky === 1 && tx === 0 && ty === 0 ? identity : transformer({
diff --git a/src/projection/index.js b/src/projection/index.js
index 8c5f977..058f504 100644
--- a/src/projection/index.js
+++ b/src/projection/index.js
@@ -1,13 +1,13 @@
-import clipAntimeridian from "../clip/antimeridian";
-import clipCircle from "../clip/circle";
-import clipRectangle from "../clip/rectangle";
-import compose from "../compose";
-import identity from "../identity";
-import {cos, degrees, radians, sin, sqrt} from "../math";
-import {rotateRadians} from "../rotation";
-import {transformer} from "../transform";
-import {fitExtent, fitSize, fitWidth, fitHeight} from "./fit";
-import resample from "./resample";
+import clipAntimeridian from "../clip/antimeridian.js";
+import clipCircle from "../clip/circle.js";
+import clipRectangle from "../clip/rectangle.js";
+import compose from "../compose.js";
+import identity from "../identity.js";
+import {cos, degrees, radians, sin, sqrt} from "../math.js";
+import {rotateRadians} from "../rotation.js";
+import {transformer} from "../transform.js";
+import {fitExtent, fitSize, fitWidth, fitHeight} from "./fit.js";
+import resample from "./resample.js";
var transformRadians = transformer({
point: function(x, y) {
diff --git a/src/projection/mercator.js b/src/projection/mercator.js
index 7908dd6..be975a9 100644
--- a/src/projection/mercator.js
+++ b/src/projection/mercator.js
@@ -1,6 +1,6 @@
-import {atan, exp, halfPi, log, pi, tan, tau} from "../math";
-import rotation from "../rotation";
-import projection from "./index";
+import {atan, exp, halfPi, log, pi, tan, tau} from "../math.js";
+import rotation from "../rotation.js";
+import projection from "./index.js";
export function mercatorRaw(lambda, phi) {
return [lambda, log(tan((halfPi + phi) / 2))];
diff --git a/src/projection/naturalEarth1.js b/src/projection/naturalEarth1.js
index 43413dc..fe5ed31 100644
--- a/src/projection/naturalEarth1.js
+++ b/src/projection/naturalEarth1.js
@@ -1,5 +1,5 @@
-import projection from "./index";
-import {abs, epsilon} from "../math";
+import projection from "./index.js";
+import {abs, epsilon} from "../math.js";
export function naturalEarth1Raw(lambda, phi) {
var phi2 = phi * phi, phi4 = phi2 * phi2;
diff --git a/src/projection/orthographic.js b/src/projection/orthographic.js
index 53736a8..b5a8351 100644
--- a/src/projection/orthographic.js
+++ b/src/projection/orthographic.js
@@ -1,6 +1,6 @@
-import {asin, cos, epsilon, sin} from "../math";
-import {azimuthalInvert} from "./azimuthal";
-import projection from "./index";
+import {asin, cos, epsilon, sin} from "../math.js";
+import {azimuthalInvert} from "./azimuthal.js";
+import projection from "./index.js";
export function orthographicRaw(x, y) {
return [cos(y) * sin(x), sin(y)];
diff --git a/src/projection/resample.js b/src/projection/resample.js
index a901969..268fc44 100644
--- a/src/projection/resample.js
+++ b/src/projection/resample.js
@@ -1,6 +1,6 @@
-import {cartesian} from "../cartesian";
-import {abs, asin, atan2, cos, epsilon, radians, sqrt} from "../math";
-import {transformer} from "../transform";
+import {cartesian} from "../cartesian.js";
+import {abs, asin, atan2, cos, epsilon, radians, sqrt} from "../math.js";
+import {transformer} from "../transform.js";
var maxDepth = 16, // maximum depth of subdivision
cosMinDistance = cos(30 * radians); // cos(minimum angular distance)
diff --git a/src/projection/stereographic.js b/src/projection/stereographic.js
index 1e68e30..5f9694a 100644
--- a/src/projection/stereographic.js
+++ b/src/projection/stereographic.js
@@ -1,6 +1,6 @@
-import {atan, cos, sin} from "../math";
-import {azimuthalInvert} from "./azimuthal";
-import projection from "./index";
+import {atan, cos, sin} from "../math.js";
+import {azimuthalInvert} from "./azimuthal.js";
+import projection from "./index.js";
export function stereographicRaw(x, y) {
var cy = cos(y), k = 1 + cos(x) * cy;
diff --git a/src/projection/transverseMercator.js b/src/projection/transverseMercator.js
index 822a3a4..bedd1c3 100644
--- a/src/projection/transverseMercator.js
+++ b/src/projection/transverseMercator.js
@@ -1,5 +1,5 @@
-import {atan, exp, halfPi, log, tan} from "../math";
-import {mercatorProjection} from "./mercator";
+import {atan, exp, halfPi, log, tan} from "../math.js";
+import {mercatorProjection} from "./mercator.js";
export function transverseMercatorRaw(lambda, phi) {
return [log(tan((halfPi + phi) / 2)), -lambda];
diff --git a/src/rotation.js b/src/rotation.js
index 4e3ead6..4e2def3 100644
--- a/src/rotation.js
+++ b/src/rotation.js
@@ -1,5 +1,5 @@
-import compose from "./compose";
-import {abs, asin, atan2, cos, degrees, pi, radians, sin, tau} from "./math";
+import compose from "./compose.js";
+import {abs, asin, atan2, cos, degrees, pi, radians, sin, tau} from "./math.js";
function rotationIdentity(lambda, phi) {
return [abs(lambda) > pi ? lambda + Math.round(-lambda / tau) * tau : lambda, phi];
diff --git a/test/polygonContains-test.js b/test/polygonContains-test.js
index 0615905..9d2af9b 100644
--- a/test/polygonContains-test.js
+++ b/test/polygonContains-test.js
@@ -1,268 +1,262 @@
-var tape = require("tape"),
- rollup = require("rollup"),
- d3_geo = require("../");
-
-rollup.rollup({input: "src/polygonContains.js"})
- .then(bundle => bundle.generate({format: "iife", name: "_"}))
- .then(bundle => {
- var contains = new Function(bundle.code + " return _;")();
-
- function polygonContains(polygon, point) {
- return contains(polygon.map(ringRadians), pointRadians(point));
- }
-
- tape("geoPolygonContains(empty, point) returns false", function(test) {
- test.equal(polygonContains([], [0, 0]), 0);
- test.end();
- });
-
- tape("geoPolygonContains(simple, point) returns the expected value", function(test) {
- var polygon = [[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]];
- test.equal(polygonContains(polygon, [0.1, 2]), 0);
- test.equal(polygonContains(polygon, [0.1, 0.1]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(smallCircle, point) returns the expected value", function(test) {
- var polygon = d3_geo.geoCircle().radius(60)().coordinates;
- test.equal(polygonContains(polygon, [-180, 0]), 0);
- test.equal(polygonContains(polygon, [1, 1]), 1);
- test.end();
- });
-
- tape("geoPolygonContains wraps longitudes", function(test) {
- var polygon = d3_geo.geoCircle().center([300, 0])().coordinates;
- test.equal(polygonContains(polygon, [300, 0]), 1);
- test.equal(polygonContains(polygon, [-60, 0]), 1);
- test.equal(polygonContains(polygon, [-420, 0]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(southPole, point) returns the expected value", function(test) {
- var polygon = [[[-60, -80], [60, -80], [180, -80], [-60, -80]]];
- test.equal(polygonContains(polygon, [0, 0]), 0);
- test.equal(polygonContains(polygon, [0, -85]), 1);
- test.equal(polygonContains(polygon, [0, -90]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(northPole, point) returns the expected value", function(test) {
- var polygon = [[[60, 80], [-60, 80], [-180, 80], [60, 80]]];
- test.equal(polygonContains(polygon, [0, 0]), 0);
- test.equal(polygonContains(polygon, [0, 85]), 1);
- test.equal(polygonContains(polygon, [0, 90]), 1);
- test.equal(polygonContains(polygon, [-100, 90]), 1);
- test.equal(polygonContains(polygon, [0, -90]), 0);
- test.end();
- });
-
- tape("geoPolygonContains(touchingPole, Pole) returns true (issue #105)", function(test) {
- var polygon = [[[0, -30], [120, -30], [0, -90], [0, -30]]];
- test.equal(polygonContains(polygon, [0, -90]), 0);
- test.equal(polygonContains(polygon, [-60, -90]), 0);
- test.equal(polygonContains(polygon, [60, -90]), 0);
- polygon = [[[0, 30], [-120, 30], [0, 90], [0, 30]]];
- test.equal(polygonContains(polygon, [0, 90]), 0);
- test.equal(polygonContains(polygon, [-60, 90]), 0);
- test.equal(polygonContains(polygon, [60, 90]), 0);
- test.end();
- });
-
- tape("geoPolygonContains(southHemispherePoly) returns the expected value", function(test) {
- var polygon = [[[0, 0], [10, -40], [-10, -40], [0, 0]]];
- test.equal(polygonContains(polygon, [0,-40.2]), 1);
- test.equal(polygonContains(polygon, [0,-40.5]), 0);
- test.end();
- });
-
- tape("geoPolygonContains(largeNearOrigin, point) returns the expected value", function(test) {
- var polygon = [[[0, 0], [1, 0], [1, 1], [0, 1], [0, 0]]];
- test.equal(polygonContains(polygon, [0.1, 0.1]), 0);
- test.equal(polygonContains(polygon, [2, 0.1]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(largeNearSouthPole, point) returns the expected value", function(test) {
- var polygon = [[[-60, 80], [60, 80], [180, 80], [-60, 80]]];
- test.equal(polygonContains(polygon, [0, 85]), 0);
- test.equal(polygonContains(polygon, [0, 0]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(largeNearNorthPole, point) returns the expected value", function(test) {
- var polygon = [[[60, -80], [-60, -80], [-180, -80], [60, -80]]];
- test.equal(polygonContains(polygon, [0, -85]), 0);
- test.equal(polygonContains(polygon, [0, 0]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(largeCircle, point) returns the expected value", function(test) {
- var polygon = d3_geo.geoCircle().radius(120)().coordinates;
- test.equal(polygonContains(polygon, [-180, 0]), 0);
- test.equal(polygonContains(polygon, [-90, 0]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(largeNarrowStripHole, point) returns the expected value", function(test) {
- var polygon = [[[-170, -1], [0, -1], [170, -1], [170, 1], [0, 1], [-170, 1], [-170, -1]]];
- test.equal(polygonContains(polygon, [0, 0]), 0);
- test.equal(polygonContains(polygon, [0, 20]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(largeNarrowEquatorialHole, point) returns the expected value", function(test) {
- var circle = d3_geo.geoCircle().center([0, -90]),
- ring0 = circle.radius(90 - 0.01)().coordinates[0],
- ring1 = circle.radius(90 + 0.01)().coordinates[0].reverse(),
- polygon = [ring0, ring1];
- test.equal(polygonContains(polygon, [0, 0]), 0);
- test.equal(polygonContains(polygon, [0, -90]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(largeNarrowEquatorialStrip, point) returns the expected value", function(test) {
- var circle = d3_geo.geoCircle().center([0, -90]),
- ring0 = circle.radius(90 + 0.01)().coordinates[0],
- ring1 = circle.radius(90 - 0.01)().coordinates[0].reverse(),
- polygon = [ring0, ring1];
- test.equal(polygonContains(polygon, [0, -90]), 0);
- test.equal(polygonContains(polygon, [0, 0]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(ringNearOrigin, point) returns the expected value", function(test) {
- var ring0 = [[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]],
- ring1 = [[0.4, 0.4], [0.6, 0.4], [0.6, 0.6], [0.4, 0.6], [0.4, 0.4]],
- polygon = [ring0, ring1];
- test.equal(polygonContains(polygon, [0.5, 0.5]), 0);
- test.equal(polygonContains(polygon, [0.1, 0.5]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(ringEquatorial, point) returns the expected value", function(test) {
- var ring0 = [[0, -10], [-120, -10], [120, -10], [0, -10]],
- ring1 = [[0, 10], [120, 10], [-120, 10], [0, 10]],
- polygon = [ring0, ring1];
- test.equal(polygonContains(polygon, [0, 20]), 0);
- test.equal(polygonContains(polygon, [0, 0]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(ringExcludingBothPoles, point) returns the expected value", function(test) {
- var ring0 = [[10, 10], [-10, 10], [-10, -10], [10, -10], [10, 10]].reverse(),
- ring1 = [[170, 10], [170, -10], [-170, -10], [-170, 10], [170, 10]].reverse(),
- polygon = [ring0, ring1];
- test.equal(polygonContains(polygon, [0, 90]), 0);
- test.equal(polygonContains(polygon, [0, 0]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(ringContainingBothPoles, point) returns the expected value", function(test) {
- var ring0 = [[10, 10], [-10, 10], [-10, -10], [10, -10], [10, 10]],
- ring1 = [[170, 10], [170, -10], [-170, -10], [-170, 10], [170, 10]],
- polygon = [ring0, ring1];
- test.equal(polygonContains(polygon, [0, 0]), 0);
- test.equal(polygonContains(polygon, [0, 20]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(ringContainingSouthPole, point) returns the expected value", function(test) {
- var ring0 = [[10, 10], [-10, 10], [-10, -10], [10, -10], [10, 10]],
- ring1 = [[0, 80], [120, 80], [-120, 80], [0, 80]],
- polygon = [ring0, ring1];
- test.equal(polygonContains(polygon, [0, 90]), 0);
- test.equal(polygonContains(polygon, [0, -90]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(ringContainingNorthPole, point) returns the expected value", function(test) {
- var ring0 = [[10, 10], [-10, 10], [-10, -10], [10, -10], [10, 10]].reverse(),
- ring1 = [[0, 80], [120, 80], [-120, 80], [0, 80]].reverse(),
- polygon = [ring0, ring1];
- test.equal(polygonContains(polygon, [0, -90]), 0);
- test.equal(polygonContains(polygon, [0, 90]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(selfIntersectingNearOrigin, point) returns the expected value", function(test) {
- var polygon = [[[0, 0], [1, 0], [1, 3], [3, 3], [3, 1], [0, 1], [0, 0]]];
- test.equal(polygonContains(polygon, [15, 0.5]), 0);
- test.equal(polygonContains(polygon, [12, 2]), 0);
- test.equal(polygonContains(polygon, [0.5, 0.5]), 1);
- test.equal(polygonContains(polygon, [2, 2]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(selfIntersectingNearSouthPole, point) returns the expected value", function(test) {
- var polygon = [[[-10, -80], [120, -80], [-120, -80], [10, -85], [10, -75], [-10, -75], [-10, -80]]];
- test.equal(polygonContains(polygon, [0, 0]), 0);
- test.equal(polygonContains(polygon, [0, -76]), 1);
- test.equal(polygonContains(polygon, [0, -89]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(selfIntersectingNearNorthPole, point) returns the expected value", function(test) {
- var polygon = [[[-10, 80], [-10, 75], [10, 75], [10, 85], [-120, 80], [120, 80], [-10, 80]]];
- test.equal(polygonContains(polygon, [0, 0]), 0);
- test.equal(polygonContains(polygon, [0, 76]), 1);
- test.equal(polygonContains(polygon, [0, 89]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(hemisphereTouchingTheSouthPole, point) returns the expected value", function(test) {
- var polygon = d3_geo.geoCircle().radius(90)().coordinates;
- test.equal(polygonContains(polygon, [0, 0]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(triangleTouchingTheSouthPole, point) returns the expected value", function(test) {
- var polygon = [[[180, -90], [-45, 0], [45, 0], [180, -90]]];
- test.equal(polygonContains(polygon, [-46, 0]), 0);
- test.equal(polygonContains(polygon, [0, 1]), 0);
- test.equal(polygonContains(polygon, [-90, -80]), 0);
- test.equal(polygonContains(polygon, [-44, 0]), 1);
- test.equal(polygonContains(polygon, [0, 0]), 1);
- test.equal(polygonContains(polygon, [0, -30]), 1);
- test.equal(polygonContains(polygon, [30, -80]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(triangleTouchingTheSouthPole2, point) returns the expected value", function(test) {
- var polygon = [[[-45, 0], [45, 0], [180, -90], [-45, 0]]];
- test.equal(polygonContains(polygon, [-46, 0]), 0);
- test.equal(polygonContains(polygon, [0, 1]), 0);
- test.equal(polygonContains(polygon, [-90, -80]), 0);
- test.equal(polygonContains(polygon, [-44, 0]), 1);
- test.equal(polygonContains(polygon, [0, 0]), 1);
- test.equal(polygonContains(polygon, [0, -30]), 1);
- test.equal(polygonContains(polygon, [30, -80]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(triangleTouchingTheSouthPole3, point) returns the expected value", function(test) {
- var polygon = [[[180, -90], [-135, 0], [135, 0], [180, -90]]];
- test.equal(polygonContains(polygon, [180, 0]), 0);
- test.equal(polygonContains(polygon, [150, 0]), 0);
- test.equal(polygonContains(polygon, [180, -30]), 0);
- test.equal(polygonContains(polygon, [150, -80]), 0);
- test.equal(polygonContains(polygon, [0, 0]), 1);
- test.equal(polygonContains(polygon, [180, 1]), 1);
- test.equal(polygonContains(polygon, [-90, -80]), 1);
- test.end();
- });
-
- tape("geoPolygonContains(triangleTouchingTheNorthPole, point) returns the expected value", function(test) {
- var polygon = [[[180, 90], [45, 0], [-45, 0], [180, 90]]];
- test.equal(polygonContains(polygon, [-90, 0]), 0);
- test.equal(polygonContains(polygon, [0, -1]), 0);
- test.equal(polygonContains(polygon, [0, -80]), 0);
- test.equal(polygonContains(polygon, [-90, 1]), 0);
- test.equal(polygonContains(polygon, [-90, 80]), 0);
- test.equal(polygonContains(polygon, [-44, 10]), 1);
- test.equal(polygonContains(polygon, [0, 10]), 1);
- test.equal(polygonContains(polygon, [30, 80]), 1);
- test.end();
- });
+import tape from "tape";
+import geoCircle from "../src/circle.js";
+import contains from "../src/polygonContains.js";
+
+function polygonContains(polygon, point) {
+ return contains(polygon.map(ringRadians), pointRadians(point));
+}
+
+tape("geoPolygonContains(empty, point) returns false", function(test) {
+ test.equal(polygonContains([], [0, 0]), 0);
+ test.end();
+});
+
+tape("geoPolygonContains(simple, point) returns the expected value", function(test) {
+ var polygon = [[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]];
+ test.equal(polygonContains(polygon, [0.1, 2]), 0);
+ test.equal(polygonContains(polygon, [0.1, 0.1]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(smallCircle, point) returns the expected value", function(test) {
+ var polygon = geoCircle().radius(60)().coordinates;
+ test.equal(polygonContains(polygon, [-180, 0]), 0);
+ test.equal(polygonContains(polygon, [1, 1]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains wraps longitudes", function(test) {
+ var polygon = geoCircle().center([300, 0])().coordinates;
+ test.equal(polygonContains(polygon, [300, 0]), 1);
+ test.equal(polygonContains(polygon, [-60, 0]), 1);
+ test.equal(polygonContains(polygon, [-420, 0]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(southPole, point) returns the expected value", function(test) {
+ var polygon = [[[-60, -80], [60, -80], [180, -80], [-60, -80]]];
+ test.equal(polygonContains(polygon, [0, 0]), 0);
+ test.equal(polygonContains(polygon, [0, -85]), 1);
+ test.equal(polygonContains(polygon, [0, -90]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(northPole, point) returns the expected value", function(test) {
+ var polygon = [[[60, 80], [-60, 80], [-180, 80], [60, 80]]];
+ test.equal(polygonContains(polygon, [0, 0]), 0);
+ test.equal(polygonContains(polygon, [0, 85]), 1);
+ test.equal(polygonContains(polygon, [0, 90]), 1);
+ test.equal(polygonContains(polygon, [-100, 90]), 1);
+ test.equal(polygonContains(polygon, [0, -90]), 0);
+ test.end();
+});
+
+tape("geoPolygonContains(touchingPole, Pole) returns true (issue #105)", function(test) {
+ var polygon = [[[0, -30], [120, -30], [0, -90], [0, -30]]];
+ test.equal(polygonContains(polygon, [0, -90]), 0);
+ test.equal(polygonContains(polygon, [-60, -90]), 0);
+ test.equal(polygonContains(polygon, [60, -90]), 0);
+ polygon = [[[0, 30], [-120, 30], [0, 90], [0, 30]]];
+ test.equal(polygonContains(polygon, [0, 90]), 0);
+ test.equal(polygonContains(polygon, [-60, 90]), 0);
+ test.equal(polygonContains(polygon, [60, 90]), 0);
+ test.end();
+});
+
+tape("geoPolygonContains(southHemispherePoly) returns the expected value", function(test) {
+ var polygon = [[[0, 0], [10, -40], [-10, -40], [0, 0]]];
+ test.equal(polygonContains(polygon, [0,-40.2]), 1);
+ test.equal(polygonContains(polygon, [0,-40.5]), 0);
+ test.end();
+});
+
+tape("geoPolygonContains(largeNearOrigin, point) returns the expected value", function(test) {
+ var polygon = [[[0, 0], [1, 0], [1, 1], [0, 1], [0, 0]]];
+ test.equal(polygonContains(polygon, [0.1, 0.1]), 0);
+ test.equal(polygonContains(polygon, [2, 0.1]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(largeNearSouthPole, point) returns the expected value", function(test) {
+ var polygon = [[[-60, 80], [60, 80], [180, 80], [-60, 80]]];
+ test.equal(polygonContains(polygon, [0, 85]), 0);
+ test.equal(polygonContains(polygon, [0, 0]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(largeNearNorthPole, point) returns the expected value", function(test) {
+ var polygon = [[[60, -80], [-60, -80], [-180, -80], [60, -80]]];
+ test.equal(polygonContains(polygon, [0, -85]), 0);
+ test.equal(polygonContains(polygon, [0, 0]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(largeCircle, point) returns the expected value", function(test) {
+ var polygon = geoCircle().radius(120)().coordinates;
+ test.equal(polygonContains(polygon, [-180, 0]), 0);
+ test.equal(polygonContains(polygon, [-90, 0]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(largeNarrowStripHole, point) returns the expected value", function(test) {
+ var polygon = [[[-170, -1], [0, -1], [170, -1], [170, 1], [0, 1], [-170, 1], [-170, -1]]];
+ test.equal(polygonContains(polygon, [0, 0]), 0);
+ test.equal(polygonContains(polygon, [0, 20]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(largeNarrowEquatorialHole, point) returns the expected value", function(test) {
+ var circle = geoCircle().center([0, -90]),
+ ring0 = circle.radius(90 - 0.01)().coordinates[0],
+ ring1 = circle.radius(90 + 0.01)().coordinates[0].reverse(),
+ polygon = [ring0, ring1];
+ test.equal(polygonContains(polygon, [0, 0]), 0);
+ test.equal(polygonContains(polygon, [0, -90]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(largeNarrowEquatorialStrip, point) returns the expected value", function(test) {
+ var circle = geoCircle().center([0, -90]),
+ ring0 = circle.radius(90 + 0.01)().coordinates[0],
+ ring1 = circle.radius(90 - 0.01)().coordinates[0].reverse(),
+ polygon = [ring0, ring1];
+ test.equal(polygonContains(polygon, [0, -90]), 0);
+ test.equal(polygonContains(polygon, [0, 0]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(ringNearOrigin, point) returns the expected value", function(test) {
+ var ring0 = [[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]],
+ ring1 = [[0.4, 0.4], [0.6, 0.4], [0.6, 0.6], [0.4, 0.6], [0.4, 0.4]],
+ polygon = [ring0, ring1];
+ test.equal(polygonContains(polygon, [0.5, 0.5]), 0);
+ test.equal(polygonContains(polygon, [0.1, 0.5]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(ringEquatorial, point) returns the expected value", function(test) {
+ var ring0 = [[0, -10], [-120, -10], [120, -10], [0, -10]],
+ ring1 = [[0, 10], [120, 10], [-120, 10], [0, 10]],
+ polygon = [ring0, ring1];
+ test.equal(polygonContains(polygon, [0, 20]), 0);
+ test.equal(polygonContains(polygon, [0, 0]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(ringExcludingBothPoles, point) returns the expected value", function(test) {
+ var ring0 = [[10, 10], [-10, 10], [-10, -10], [10, -10], [10, 10]].reverse(),
+ ring1 = [[170, 10], [170, -10], [-170, -10], [-170, 10], [170, 10]].reverse(),
+ polygon = [ring0, ring1];
+ test.equal(polygonContains(polygon, [0, 90]), 0);
+ test.equal(polygonContains(polygon, [0, 0]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(ringContainingBothPoles, point) returns the expected value", function(test) {
+ var ring0 = [[10, 10], [-10, 10], [-10, -10], [10, -10], [10, 10]],
+ ring1 = [[170, 10], [170, -10], [-170, -10], [-170, 10], [170, 10]],
+ polygon = [ring0, ring1];
+ test.equal(polygonContains(polygon, [0, 0]), 0);
+ test.equal(polygonContains(polygon, [0, 20]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(ringContainingSouthPole, point) returns the expected value", function(test) {
+ var ring0 = [[10, 10], [-10, 10], [-10, -10], [10, -10], [10, 10]],
+ ring1 = [[0, 80], [120, 80], [-120, 80], [0, 80]],
+ polygon = [ring0, ring1];
+ test.equal(polygonContains(polygon, [0, 90]), 0);
+ test.equal(polygonContains(polygon, [0, -90]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(ringContainingNorthPole, point) returns the expected value", function(test) {
+ var ring0 = [[10, 10], [-10, 10], [-10, -10], [10, -10], [10, 10]].reverse(),
+ ring1 = [[0, 80], [120, 80], [-120, 80], [0, 80]].reverse(),
+ polygon = [ring0, ring1];
+ test.equal(polygonContains(polygon, [0, -90]), 0);
+ test.equal(polygonContains(polygon, [0, 90]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(selfIntersectingNearOrigin, point) returns the expected value", function(test) {
+ var polygon = [[[0, 0], [1, 0], [1, 3], [3, 3], [3, 1], [0, 1], [0, 0]]];
+ test.equal(polygonContains(polygon, [15, 0.5]), 0);
+ test.equal(polygonContains(polygon, [12, 2]), 0);
+ test.equal(polygonContains(polygon, [0.5, 0.5]), 1);
+ test.equal(polygonContains(polygon, [2, 2]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(selfIntersectingNearSouthPole, point) returns the expected value", function(test) {
+ var polygon = [[[-10, -80], [120, -80], [-120, -80], [10, -85], [10, -75], [-10, -75], [-10, -80]]];
+ test.equal(polygonContains(polygon, [0, 0]), 0);
+ test.equal(polygonContains(polygon, [0, -76]), 1);
+ test.equal(polygonContains(polygon, [0, -89]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(selfIntersectingNearNorthPole, point) returns the expected value", function(test) {
+ var polygon = [[[-10, 80], [-10, 75], [10, 75], [10, 85], [-120, 80], [120, 80], [-10, 80]]];
+ test.equal(polygonContains(polygon, [0, 0]), 0);
+ test.equal(polygonContains(polygon, [0, 76]), 1);
+ test.equal(polygonContains(polygon, [0, 89]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(hemisphereTouchingTheSouthPole, point) returns the expected value", function(test) {
+ var polygon = geoCircle().radius(90)().coordinates;
+ test.equal(polygonContains(polygon, [0, 0]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(triangleTouchingTheSouthPole, point) returns the expected value", function(test) {
+ var polygon = [[[180, -90], [-45, 0], [45, 0], [180, -90]]];
+ test.equal(polygonContains(polygon, [-46, 0]), 0);
+ test.equal(polygonContains(polygon, [0, 1]), 0);
+ test.equal(polygonContains(polygon, [-90, -80]), 0);
+ test.equal(polygonContains(polygon, [-44, 0]), 1);
+ test.equal(polygonContains(polygon, [0, 0]), 1);
+ test.equal(polygonContains(polygon, [0, -30]), 1);
+ test.equal(polygonContains(polygon, [30, -80]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(triangleTouchingTheSouthPole2, point) returns the expected value", function(test) {
+ var polygon = [[[-45, 0], [45, 0], [180, -90], [-45, 0]]];
+ test.equal(polygonContains(polygon, [-46, 0]), 0);
+ test.equal(polygonContains(polygon, [0, 1]), 0);
+ test.equal(polygonContains(polygon, [-90, -80]), 0);
+ test.equal(polygonContains(polygon, [-44, 0]), 1);
+ test.equal(polygonContains(polygon, [0, 0]), 1);
+ test.equal(polygonContains(polygon, [0, -30]), 1);
+ test.equal(polygonContains(polygon, [30, -80]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(triangleTouchingTheSouthPole3, point) returns the expected value", function(test) {
+ var polygon = [[[180, -90], [-135, 0], [135, 0], [180, -90]]];
+ test.equal(polygonContains(polygon, [180, 0]), 0);
+ test.equal(polygonContains(polygon, [150, 0]), 0);
+ test.equal(polygonContains(polygon, [180, -30]), 0);
+ test.equal(polygonContains(polygon, [150, -80]), 0);
+ test.equal(polygonContains(polygon, [0, 0]), 1);
+ test.equal(polygonContains(polygon, [180, 1]), 1);
+ test.equal(polygonContains(polygon, [-90, -80]), 1);
+ test.end();
+});
+
+tape("geoPolygonContains(triangleTouchingTheNorthPole, point) returns the expected value", function(test) {
+ var polygon = [[[180, 90], [45, 0], [-45, 0], [180, 90]]];
+ test.equal(polygonContains(polygon, [-90, 0]), 0);
+ test.equal(polygonContains(polygon, [0, -1]), 0);
+ test.equal(polygonContains(polygon, [0, -80]), 0);
+ test.equal(polygonContains(polygon, [-90, 1]), 0);
+ test.equal(polygonContains(polygon, [-90, 80]), 0);
+ test.equal(polygonContains(polygon, [-44, 10]), 1);
+ test.equal(polygonContains(polygon, [0, 10]), 1);
+ test.equal(polygonContains(polygon, [30, 80]), 1);
+ test.end();
});
function ringRadians(ring) {
diff --git a/test/projection/transverseMercator-test.js b/test/projection/transverseMercator-test.js
index 60013b3..ff30688 100644
--- a/test/projection/transverseMercator-test.js
+++ b/test/projection/transverseMercator-test.js
@@ -1,6 +1,8 @@
var tape = require("tape"),
d3 = require("../../");
+require("../pathEqual");
+
tape("transverseMercator.clipExtent(null) sets the default automatic clip extent", function(test) {
var projection = d3.geoTransverseMercator().translate([0, 0]).scale(1).clipExtent(null).precision(0);
test.pathEqual(d3.geoPath(projection)({type: "Sphere"}), "M3.141593,3.141593L0,3.141593L-3.141593,3.141593L-3.141593,-3.141593L-3.141593,-3.141593L0,-3.141593L3.141593,-3.141593L3.141593,3.141593Z");
diff --git a/yarn.lock b/yarn.lock
index 25f178f..7262b9a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,15 +2,17 @@
# yarn lockfile v1
-"@babel/code-frame@^7.0.0-beta.47":
- version "7.0.0-rc.3"
- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-rc.3.tgz#d77a587401f818a3168700f596e41cd6905947b2"
+"@babel/code-frame@^7.0.0":
+ version "7.5.5"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
+ integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==
dependencies:
- "@babel/highlight" "7.0.0-rc.3"
+ "@babel/highlight" "^7.0.0"
-"@babel/highlight@7.0.0-rc.3":
- version "7.0.0-rc.3"
- resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-rc.3.tgz#c2ee83f8e5c0c387279a8c48e06fef2e32027004"
+"@babel/highlight@^7.0.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540"
+ integrity sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==
dependencies:
chalk "^2.0.0"
esutils "^2.0.2"
@@ -19,91 +21,76 @@
"@types/estree@0.0.39":
version "0.0.39"
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
+ integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
-"@types/node@*":
- version "10.9.1"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.1.tgz#06f002136fbcf51e730995149050bb3c45ee54e6"
+"@types/node@^12.6.2":
+ version "12.6.8"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.6.8.tgz#e469b4bf9d1c9832aee4907ba8a051494357c12c"
+ integrity sha512-aX+gFgA5GHcDi89KG5keey2zf0WfZk/HAQotEamsK2kbey+8yGKcson0hbK8E+v0NArlCJQCqMP161YhV6ZXLg==
-acorn-jsx@^4.1.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz#e8e41e48ea2fe0c896740610ab6a4ffd8add225e"
- dependencies:
- acorn "^5.0.3"
-
-acorn@^5.0.3, acorn@^5.6.0:
- version "5.7.2"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.2.tgz#91fa871883485d06708800318404e72bfb26dcc5"
+acorn-jsx@^5.0.0:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e"
+ integrity sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==
-ajv-keywords@^3.0.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
+acorn@^6.0.7, acorn@^6.2.0:
+ version "6.2.1"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.2.1.tgz#3ed8422d6dec09e6121cc7a843ca86a330a86b51"
+ integrity sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==
-ajv@^6.0.1, ajv@^6.5.0:
- version "6.5.3"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9"
+ajv@^6.10.0, ajv@^6.10.2:
+ version "6.10.2"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
+ integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
dependencies:
fast-deep-equal "^2.0.1"
fast-json-stable-stringify "^2.0.0"
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"
-ansi-escapes@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
-
-ansi-regex@^2.0.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+ansi-escapes@^3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+ integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
ansi-regex@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+ integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-ansi-styles@^2.2.1:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+ansi-regex@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+ integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-ansi-styles@^3.2.1:
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+ integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
dependencies:
color-convert "^1.9.0"
argparse@^1.0.7:
version "1.0.10"
resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+ integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
dependencies:
sprintf-js "~1.0.2"
-array-union@^1.0.1:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
- dependencies:
- array-uniq "^1.0.1"
-
-array-uniq@^1.0.1:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-
-arrify@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-
-babel-code-frame@^6.26.0:
- version "6.26.0"
- resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
- dependencies:
- chalk "^1.1.3"
- esutils "^2.0.2"
- js-tokens "^3.0.2"
+astral-regex@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+ integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
balanced-match@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+ integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
brace-expansion@^1.1.7:
version "1.1.11"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+ integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
dependencies:
balanced-match "^1.0.0"
concat-map "0.0.1"
@@ -111,84 +98,77 @@ brace-expansion@^1.1.7:
buffer-from@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+ integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-caller-path@^0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
- dependencies:
- callsites "^0.2.0"
-
-callsites@^0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+callsites@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+ integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
canvas@1:
- version "1.6.11"
- resolved "https://registry.yarnpkg.com/canvas/-/canvas-1.6.11.tgz#c2d8bcf283281f19ded14fa163a111804522330d"
+ version "1.6.13"
+ resolved "https://registry.yarnpkg.com/canvas/-/canvas-1.6.13.tgz#8cb4e9abbea9e615a377890ffac50277a1167c73"
+ integrity sha512-XAfzfEOHZ3JIPjEV+WSI6PpISgUta3dgmndWbsajotz+0TQOX/jDpp2kawjRERatOGv9sMMzk5auB3GKEKA6hg==
dependencies:
nan "^2.10.0"
-chalk@^1.1.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
- dependencies:
- ansi-styles "^2.2.1"
- escape-string-regexp "^1.0.2"
- has-ansi "^2.0.0"
- strip-ansi "^3.0.0"
- supports-color "^2.0.0"
-
-chalk@^2.0.0, chalk@^2.1.0:
- version "2.4.1"
- resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
+chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.2:
+ version "2.4.2"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+ integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
dependencies:
ansi-styles "^3.2.1"
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
-chardet@^0.4.0:
- version "0.4.2"
- resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
-
-circular-json@^0.3.1:
- version "0.3.3"
- resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
+chardet@^0.7.0:
+ version "0.7.0"
+ resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+ integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
cli-cursor@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+ integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
dependencies:
restore-cursor "^2.0.0"
cli-width@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+ integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
color-convert@^1.9.0:
- version "1.9.2"
- resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.2.tgz#49881b8fba67df12a96bdf3f56c0aab9e7913147"
+ version "1.9.3"
+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+ integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
dependencies:
- color-name "1.1.1"
+ color-name "1.1.3"
-color-name@1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.1.tgz#4b1415304cf50028ea81643643bd82ea05803689"
-
-commander@2:
- version "2.17.1"
- resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+color-name@1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+ integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-commander@~2.16.0:
- version "2.16.0"
- resolved "https://registry.yarnpkg.com/commander/-/commander-2.16.0.tgz#f16390593996ceb4f3eeb020b31d78528f7f8a50"
+commander@2, commander@^2.20.0:
+ version "2.20.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+ integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
concat-map@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+ integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+core-util-is@~1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+ integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
cross-spawn@^6.0.5:
version "6.0.5"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+ integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
dependencies:
nice-try "^1.0.4"
path-key "^2.0.1"
@@ -199,227 +179,281 @@ cross-spawn@^6.0.5:
d3-array@1:
version "1.2.4"
resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f"
+ integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==
d3-format@1:
version "1.3.2"
resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.3.2.tgz#6a96b5e31bcb98122a30863f7d92365c00603562"
+ integrity sha512-Z18Dprj96ExragQ0DeGi+SYPQ7pPfRMtUXtsg/ChVIKNBCzjO8XYJvRTC1usblx52lqge56V5ect+frYTQc8WQ==
-debug@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+debug@^4.0.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+ integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
dependencies:
- ms "2.0.0"
+ ms "^2.1.1"
deep-equal@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+ integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
deep-is@~0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+ integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
define-properties@^1.1.2:
version "1.1.3"
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+ integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
dependencies:
object-keys "^1.0.12"
defined@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+ integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
-del@^2.0.2:
- version "2.2.2"
- resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
- dependencies:
- globby "^5.0.0"
- is-path-cwd "^1.0.0"
- is-path-in-cwd "^1.0.0"
- object-assign "^4.0.1"
- pify "^2.0.0"
- pinkie-promise "^2.0.0"
- rimraf "^2.2.8"
-
-doctrine@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+doctrine@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+ integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
dependencies:
esutils "^2.0.2"
+emoji-regex@^7.0.1:
+ version "7.0.3"
+ resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+ integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
es-abstract@^1.5.0:
- version "1.12.0"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
+ version "1.13.0"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
+ integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
dependencies:
- es-to-primitive "^1.1.1"
+ es-to-primitive "^1.2.0"
function-bind "^1.1.1"
- has "^1.0.1"
- is-callable "^1.1.3"
+ has "^1.0.3"
+ is-callable "^1.1.4"
is-regex "^1.0.4"
+ object-keys "^1.0.12"
-es-to-primitive@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
+es-to-primitive@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
+ integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
dependencies:
- is-callable "^1.1.1"
+ is-callable "^1.1.4"
is-date-object "^1.0.1"
- is-symbol "^1.0.1"
+ is-symbol "^1.0.2"
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+ integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-eslint-scope@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
+eslint-plugin-es5@1:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-es5/-/eslint-plugin-es5-1.4.1.tgz#258fe89bc5f72fbd9f5f7936c840151766821f1e"
+ integrity sha512-kktkmkF2O7pnSZYgrMiYMbt3wCKRIiXePwILv8USDG95YgP0PzhIxSIROLLKmiQQ/Z6LuhDGWTHK04gnbXBvkg==
+
+eslint-scope@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
+ integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
dependencies:
esrecurse "^4.1.0"
estraverse "^4.1.1"
eslint-utils@^1.3.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
+ version "1.4.3"
+ resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
+ integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
+ dependencies:
+ eslint-visitor-keys "^1.1.0"
-eslint-visitor-keys@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
+eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
+ integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
-eslint@5:
- version "5.4.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.4.0.tgz#d068ec03006bb9e06b429dc85f7e46c1b69fac62"
+eslint@6:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.1.0.tgz#06438a4a278b1d84fb107d24eaaa35471986e646"
+ integrity sha512-QhrbdRD7ofuV09IuE2ySWBz0FyXCq0rriLTZXZqaWSI79CVtHVRdkFuFTViiqzZhkCgfOh9USpriuGN2gIpZDQ==
dependencies:
- ajv "^6.5.0"
- babel-code-frame "^6.26.0"
+ "@babel/code-frame" "^7.0.0"
+ ajv "^6.10.0"
chalk "^2.1.0"
cross-spawn "^6.0.5"
- debug "^3.1.0"
- doctrine "^2.1.0"
- eslint-scope "^4.0.0"
+ debug "^4.0.1"
+ doctrine "^3.0.0"
+ eslint-scope "^5.0.0"
eslint-utils "^1.3.1"
eslint-visitor-keys "^1.0.0"
- espree "^4.0.0"
+ espree "^6.0.0"
esquery "^1.0.1"
esutils "^2.0.2"
- file-entry-cache "^2.0.0"
+ file-entry-cache "^5.0.1"
functional-red-black-tree "^1.0.1"
- glob "^7.1.2"
+ glob-parent "^5.0.0"
globals "^11.7.0"
- ignore "^4.0.2"
+ ignore "^4.0.6"
+ import-fresh "^3.0.0"
imurmurhash "^0.1.4"
- inquirer "^5.2.0"
- is-resolvable "^1.1.0"
- js-yaml "^3.11.0"
+ inquirer "^6.4.1"
+ is-glob "^4.0.0"
+ js-yaml "^3.13.1"
json-stable-stringify-without-jsonify "^1.0.1"
levn "^0.3.0"
- lodash "^4.17.5"
+ lodash "^4.17.14"
minimatch "^3.0.4"
mkdirp "^0.5.1"
natural-compare "^1.4.0"
optionator "^0.8.2"
- path-is-inside "^1.0.2"
- pluralize "^7.0.0"
progress "^2.0.0"
- regexpp "^2.0.0"
- require-uncached "^1.0.3"
- semver "^5.5.0"
- strip-ansi "^4.0.0"
- strip-json-comments "^2.0.1"
- table "^4.0.3"
+ regexpp "^2.0.1"
+ semver "^6.1.2"
+ strip-ansi "^5.2.0"
+ strip-json-comments "^3.0.1"
+ table "^5.2.3"
text-table "^0.2.0"
+ v8-compile-cache "^2.0.3"
-espree@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/espree/-/espree-4.0.0.tgz#253998f20a0f82db5d866385799d912a83a36634"
+esm@3:
+ version "3.2.25"
+ resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
+ integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
+
+espree@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/espree/-/espree-6.0.0.tgz#716fc1f5a245ef5b9a7fdb1d7b0d3f02322e75f6"
+ integrity sha512-lJvCS6YbCn3ImT3yKkPe0+tJ+mH6ljhGNjHQH9mRtiO6gjhVAOhVXW1yjnwqGwTkK3bGbye+hb00nFNmu0l/1Q==
dependencies:
- acorn "^5.6.0"
- acorn-jsx "^4.1.1"
+ acorn "^6.0.7"
+ acorn-jsx "^5.0.0"
+ eslint-visitor-keys "^1.0.0"
esprima@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+ integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
esquery@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
+ integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
dependencies:
estraverse "^4.0.0"
esrecurse@^4.1.0:
version "4.2.1"
resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+ integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
dependencies:
estraverse "^4.1.0"
estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
version "4.2.0"
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+ integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
+
+estree-walker@^0.6.1:
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
+ integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
esutils@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+ integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
-external-editor@^2.1.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
+external-editor@^3.0.3:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+ integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
dependencies:
- chardet "^0.4.0"
- iconv-lite "^0.4.17"
+ chardet "^0.7.0"
+ iconv-lite "^0.4.24"
tmp "^0.0.33"
fast-deep-equal@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+ integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
fast-json-stable-stringify@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+ integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
fast-levenshtein@~2.0.4:
version "2.0.6"
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+ integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
figures@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+ integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
dependencies:
escape-string-regexp "^1.0.5"
-file-entry-cache@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+file-entry-cache@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
+ integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
dependencies:
- flat-cache "^1.2.1"
- object-assign "^4.0.1"
+ flat-cache "^2.0.1"
-flat-cache@^1.2.1:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
+flat-cache@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
+ integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
dependencies:
- circular-json "^0.3.1"
- del "^2.0.2"
- graceful-fs "^4.1.2"
- write "^0.2.1"
+ flatted "^2.0.0"
+ rimraf "2.6.3"
+ write "1.0.3"
+
+flatted@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
+ integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
for-each@~0.3.3:
version "0.3.3"
resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+ integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
dependencies:
is-callable "^1.1.3"
fs.realpath@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+ integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
function-bind@^1.0.2, function-bind@^1.1.1, function-bind@~1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+ integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
functional-red-black-tree@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+ integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-glob@^7.0.3, glob@^7.0.5, glob@^7.1.2, glob@~7.1.2:
- version "7.1.2"
- resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+glob-parent@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz#1dc99f0f39b006d3e92c2c284068382f0c20e954"
+ integrity sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==
+ dependencies:
+ is-glob "^4.0.1"
+
+glob@^7.1.3, glob@~7.1.4:
+ version "7.1.4"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+ integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
@@ -429,144 +463,157 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.1.2, glob@~7.1.2:
path-is-absolute "^1.0.0"
globals@^11.7.0:
- version "11.7.0"
- resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
-
-globby@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
- dependencies:
- array-union "^1.0.1"
- arrify "^1.0.0"
- glob "^7.0.3"
- object-assign "^4.0.1"
- pify "^2.0.0"
- pinkie-promise "^2.0.0"
-
-graceful-fs@^4.1.2:
- version "4.1.11"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-
-has-ansi@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
- dependencies:
- ansi-regex "^2.0.0"
+ version "11.12.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+ integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
has-flag@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+ integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-symbols@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+ integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
-has@^1.0.1, has@~1.0.3:
+has@^1.0.1, has@^1.0.3, has@~1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+ integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
dependencies:
function-bind "^1.1.1"
-iconv-lite@^0.4.17:
+iconv-lite@^0.4.24:
version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+ integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
dependencies:
safer-buffer ">= 2.1.2 < 3"
-ignore@^4.0.2:
+ignore@^4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+ integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+
+import-fresh@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.1.0.tgz#6d33fa1dcef6df930fae003446f33415af905118"
+ integrity sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==
+ dependencies:
+ parent-module "^1.0.0"
+ resolve-from "^4.0.0"
imurmurhash@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+ integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
inflight@^1.0.4:
version "1.0.6"
resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+ integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
dependencies:
once "^1.3.0"
wrappy "1"
-inherits@2, inherits@~2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+inherits@2, inherits@~2.0.3, inherits@~2.0.4:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+ integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-inquirer@^5.2.0:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.2.0.tgz#db350c2b73daca77ff1243962e9f22f099685726"
+inquirer@^6.4.1:
+ version "6.5.0"
+ resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz#2303317efc9a4ea7ec2e2df6f86569b734accf42"
+ integrity sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==
dependencies:
- ansi-escapes "^3.0.0"
- chalk "^2.0.0"
+ ansi-escapes "^3.2.0"
+ chalk "^2.4.2"
cli-cursor "^2.1.0"
cli-width "^2.0.0"
- external-editor "^2.1.0"
+ external-editor "^3.0.3"
figures "^2.0.0"
- lodash "^4.3.0"
+ lodash "^4.17.12"
mute-stream "0.0.7"
run-async "^2.2.0"
- rxjs "^5.5.2"
+ rxjs "^6.4.0"
string-width "^2.1.0"
- strip-ansi "^4.0.0"
+ strip-ansi "^5.1.0"
through "^2.3.6"
-is-callable@^1.1.1, is-callable@^1.1.3:
+is-callable@^1.1.3, is-callable@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+ integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
is-date-object@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+ integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
+
+is-extglob@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+ integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
is-fullwidth-code-point@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+ integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-is-path-cwd@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-
-is-path-in-cwd@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
- dependencies:
- is-path-inside "^1.0.0"
-
-is-path-inside@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+is-glob@^4.0.0, is-glob@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+ integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
dependencies:
- path-is-inside "^1.0.1"
+ is-extglob "^2.1.1"
is-promise@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+ integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
is-regex@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+ integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
dependencies:
has "^1.0.1"
-is-resolvable@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
+is-symbol@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
+ integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
+ dependencies:
+ has-symbols "^1.0.0"
-is-symbol@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
+isarray@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+ integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
isexe@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+ integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-js-tokens@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+jest-worker@^24.6.0:
+ version "24.6.0"
+ resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz#7f81ceae34b7cde0c9827a6980c35b7cdc0161b3"
+ integrity sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==
+ dependencies:
+ merge-stream "^1.0.1"
+ supports-color "^6.1.0"
js-tokens@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+ integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-js-yaml@^3.11.0:
- version "3.12.0"
- resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
+js-yaml@^3.13.1:
+ version "3.13.1"
+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+ integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"
@@ -574,93 +621,115 @@ js-yaml@^3.11.0:
json-schema-traverse@^0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+ integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
json-stable-stringify-without-jsonify@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+ integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
levn@^0.3.0, levn@~0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+ integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
dependencies:
prelude-ls "~1.1.2"
type-check "~0.3.2"
-lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0:
- version "4.17.10"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+lodash@^4.17.12, lodash@^4.17.14:
+ version "4.17.15"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+ integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+
+merge-stream@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+ integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
+ dependencies:
+ readable-stream "^2.0.1"
mimic-fn@^1.0.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+ integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
minimatch@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+ integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
dependencies:
brace-expansion "^1.1.7"
minimist@0.0.8:
version "0.0.8"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+ integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
minimist@~1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+ integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
mkdirp@^0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+ integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
dependencies:
minimist "0.0.8"
-ms@2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+ms@^2.1.1:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+ integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
mute-stream@0.0.7:
version "0.0.7"
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+ integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
nan@^2.10.0:
- version "2.10.0"
- resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+ version "2.14.0"
+ resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+ integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
natural-compare@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+ integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
nice-try@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4"
-
-object-assign@^4.0.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+ integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
object-inspect@~1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
+ integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
object-keys@^1.0.12:
- version "1.0.12"
- resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+ integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
once@^1.3.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+ integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
dependencies:
wrappy "1"
onetime@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+ integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
dependencies:
mimic-fn "^1.0.0"
optionator@^0.8.2:
version "0.8.2"
resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+ integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
dependencies:
deep-is "~0.1.3"
fast-levenshtein "~2.0.4"
@@ -672,77 +741,84 @@ optionator@^0.8.2:
os-tmpdir@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+ integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+
+parent-module@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+ integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+ dependencies:
+ callsites "^3.0.0"
path-is-absolute@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-
-path-is-inside@^1.0.1, path-is-inside@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+ integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
path-key@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+ integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-path-parse@^1.0.5:
+path-parse@^1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-
-pify@^2.0.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-
-pinkie-promise@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
- dependencies:
- pinkie "^2.0.0"
-
-pinkie@^2.0.0:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-
-pluralize@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+ integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
prelude-ls@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+ integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+
+process-nextick-args@~2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+ integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
progress@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+ integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
punycode@^2.1.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+ integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-regexpp@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.0.tgz#b2a7534a85ca1b033bcf5ce9ff8e56d4e0755365"
-
-require-uncached@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+readable-stream@^2.0.1:
+ version "2.3.6"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+ integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
dependencies:
- caller-path "^0.1.0"
- resolve-from "^1.0.0"
+ core-util-is "~1.0.0"
+ inherits "~2.0.3"
+ isarray "~1.0.0"
+ process-nextick-args "~2.0.0"
+ safe-buffer "~5.1.1"
+ string_decoder "~1.1.1"
+ util-deprecate "~1.0.1"
-resolve-from@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+regexpp@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
+ integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
+
+resolve-from@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+ integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-resolve@~1.7.1:
- version "1.7.1"
- resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
+resolve@~1.11.1:
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
+ integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==
dependencies:
- path-parse "^1.0.5"
+ path-parse "^1.0.6"
restore-cursor@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+ integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
dependencies:
onetime "^2.0.0"
signal-exit "^3.0.2"
@@ -750,72 +826,113 @@ restore-cursor@^2.0.0:
resumer@~0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/resumer/-/resumer-0.0.0.tgz#f1e8f461e4064ba39e82af3cdc2a8c893d076759"
+ integrity sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=
dependencies:
through "~2.3.4"
-rimraf@^2.2.8:
- version "2.6.2"
- resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+rimraf@2.6.3:
+ version "2.6.3"
+ resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+ integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
dependencies:
- glob "^7.0.5"
+ glob "^7.1.3"
-rollup-plugin-terser@1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-1.0.1.tgz#ba5f497cbc9aa38ba19d3ee2167c04ea3ed279af"
+rollup-plugin-terser@5:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-5.1.1.tgz#e9d2545ec8d467f96ba99b9216d2285aad8d5b66"
+ integrity sha512-McIMCDEY8EU6Y839C09UopeRR56wXHGdvKKjlfiZG/GrP6wvZQ62u2ko/Xh1MNH2M9WDL+obAAHySljIZYCuPQ==
+ dependencies:
+ "@babel/code-frame" "^7.0.0"
+ jest-worker "^24.6.0"
+ rollup-pluginutils "^2.8.1"
+ serialize-javascript "^1.7.0"
+ terser "^4.1.0"
+
+rollup-pluginutils@^2.8.1:
+ version "2.8.1"
+ resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.1.tgz#8fa6dd0697344938ef26c2c09d2488ce9e33ce97"
+ integrity sha512-J5oAoysWar6GuZo0s+3bZ6sVZAC0pfqKz68De7ZgDi5z63jOVZn1uJL/+z1jeKHNbGII8kAyHF5q8LnxSX5lQg==
dependencies:
- "@babel/code-frame" "^7.0.0-beta.47"
- terser "^3.7.5"
+ estree-walker "^0.6.1"
-rollup@0.64:
- version "0.64.1"
- resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.64.1.tgz#9188ee368e5fcd43ffbc00ec414e72eeb5de87ba"
+rollup@1:
+ version "1.17.0"
+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.17.0.tgz#47ee8b04514544fc93b39bae06271244c8db7dfa"
+ integrity sha512-k/j1m0NIsI4SYgCJR4MWPstGJOWfJyd6gycKoMhyoKPVXxm+L49XtbUwZyFsrSU2YXsOkM4u1ll9CS/ZgJBUpw==
dependencies:
"@types/estree" "0.0.39"
- "@types/node" "*"
+ "@types/node" "^12.6.2"
+ acorn "^6.2.0"
run-async@^2.2.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+ integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
dependencies:
is-promise "^2.1.0"
-rxjs@^5.5.2:
- version "5.5.11"
- resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.11.tgz#f733027ca43e3bec6b994473be4ab98ad43ced87"
+rxjs@^6.4.0:
+ version "6.5.2"
+ resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
+ integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
dependencies:
- symbol-observable "1.0.1"
+ tslib "^1.9.0"
+
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+ version "5.1.2"
+ resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+ integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
"safer-buffer@>= 2.1.2 < 3":
version "2.1.2"
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+ integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
semver@^5.5.0:
- version "5.5.1"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
+ version "5.7.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
+ integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+
+semver@^6.1.2:
+ version "6.3.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+ integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
+serialize-javascript@^1.7.0:
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"
+ integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==
shebang-command@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+ integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
dependencies:
shebang-regex "^1.0.0"
shebang-regex@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+ integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
signal-exit@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+ integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
-slice-ansi@1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
+slice-ansi@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
+ integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
dependencies:
+ ansi-styles "^3.2.0"
+ astral-regex "^1.0.0"
is-fullwidth-code-point "^2.0.0"
-source-map-support@~0.5.6:
- version "0.5.9"
- resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
+source-map-support@~0.5.12:
+ version "0.5.12"
+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+ integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
dependencies:
buffer-from "^1.0.0"
source-map "^0.6.0"
@@ -823,145 +940,195 @@ source-map-support@~0.5.6:
source-map@^0.6.0, source-map@~0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+ integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
sprintf-js@~1.0.2:
version "1.0.3"
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+ integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-string-width@^2.1.0, string-width@^2.1.1:
+string-width@^2.1.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+ integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
dependencies:
is-fullwidth-code-point "^2.0.0"
strip-ansi "^4.0.0"
+string-width@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+ integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+ dependencies:
+ emoji-regex "^7.0.1"
+ is-fullwidth-code-point "^2.0.0"
+ strip-ansi "^5.1.0"
+
string.prototype.trim@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea"
+ integrity sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=
dependencies:
define-properties "^1.1.2"
es-abstract "^1.5.0"
function-bind "^1.0.2"
-strip-ansi@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+string_decoder@~1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+ integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
dependencies:
- ansi-regex "^2.0.0"
+ safe-buffer "~5.1.0"
strip-ansi@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+ integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
dependencies:
ansi-regex "^3.0.0"
-strip-json-comments@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+ integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+ dependencies:
+ ansi-regex "^4.1.0"
-supports-color@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+strip-json-comments@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
+ integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
supports-color@^5.3.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+ integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
dependencies:
has-flag "^3.0.0"
-symbol-observable@1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
+supports-color@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+ integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+ dependencies:
+ has-flag "^3.0.0"
-table@^4.0.3:
- version "4.0.3"
- resolved "https://registry.yarnpkg.com/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
+table@^5.2.3:
+ version "5.4.4"
+ resolved "https://registry.yarnpkg.com/table/-/table-5.4.4.tgz#6e0f88fdae3692793d1077fd172a4667afe986a6"
+ integrity sha512-IIfEAUx5QlODLblLrGTTLJA7Tk0iLSGBvgY8essPRVNGHAzThujww1YqHLs6h3HfTg55h++RzLHH5Xw/rfv+mg==
dependencies:
- ajv "^6.0.1"
- ajv-keywords "^3.0.0"
- chalk "^2.1.0"
- lodash "^4.17.4"
- slice-ansi "1.0.0"
- string-width "^2.1.1"
+ ajv "^6.10.2"
+ lodash "^4.17.14"
+ slice-ansi "^2.1.0"
+ string-width "^3.0.0"
tape@4:
- version "4.9.1"
- resolved "https://registry.yarnpkg.com/tape/-/tape-4.9.1.tgz#1173d7337e040c76fbf42ec86fcabedc9b3805c9"
+ version "4.11.0"
+ resolved "https://registry.yarnpkg.com/tape/-/tape-4.11.0.tgz#63d41accd95e45a23a874473051c57fdbc58edc1"
+ integrity sha512-yixvDMX7q7JIs/omJSzSZrqulOV51EC9dK8dM0TzImTIkHWfe2/kFyL5v+d9C+SrCMaICk59ujsqFAVidDqDaA==
dependencies:
deep-equal "~1.0.1"
defined "~1.0.0"
for-each "~0.3.3"
function-bind "~1.1.1"
- glob "~7.1.2"
+ glob "~7.1.4"
has "~1.0.3"
- inherits "~2.0.3"
+ inherits "~2.0.4"
minimist "~1.2.0"
object-inspect "~1.6.0"
- resolve "~1.7.1"
+ resolve "~1.11.1"
resumer "~0.0.0"
string.prototype.trim "~1.1.2"
through "~2.3.8"
-terser@^3.7.5:
- version "3.8.1"
- resolved "https://registry.yarnpkg.com/terser/-/terser-3.8.1.tgz#cb70070ac9e0a71add169dfb63c0a64fca2738ac"
+terser@^4.1.0:
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-4.1.2.tgz#b2656c8a506f7ce805a3f300a2ff48db022fa391"
+ integrity sha512-jvNoEQSPXJdssFwqPSgWjsOrb+ELoE+ILpHPKXC83tIxOlh2U75F1KuB2luLD/3a6/7K3Vw5pDn+hvu0C4AzSw==
dependencies:
- commander "~2.16.0"
+ commander "^2.20.0"
source-map "~0.6.1"
- source-map-support "~0.5.6"
+ source-map-support "~0.5.12"
text-table@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+ integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
through@^2.3.6, through@~2.3.4, through@~2.3.8:
version "2.3.8"
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+ integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
tmp@^0.0.33:
version "0.0.33"
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+ integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
dependencies:
os-tmpdir "~1.0.2"
topojson-client@3:
version "3.0.0"
resolved "https://registry.yarnpkg.com/topojson-client/-/topojson-client-3.0.0.tgz#1f99293a77ef42a448d032a81aa982b73f360d2f"
+ integrity sha1-H5kpOnfvQqRI0DKoGqmCtz82DS8=
dependencies:
commander "2"
+tslib@^1.9.0:
+ version "1.10.0"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
+ integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
+
type-check@~0.3.2:
version "0.3.2"
resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+ integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
dependencies:
prelude-ls "~1.1.2"
uri-js@^4.2.2:
version "4.2.2"
resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+ integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
dependencies:
punycode "^2.1.0"
+util-deprecate@~1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+ integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+v8-compile-cache@^2.0.3:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
+ integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==
+
which@^1.2.9:
version "1.3.1"
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+ integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
dependencies:
isexe "^2.0.0"
wordwrap@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+ integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
world-atlas@1:
version "1.1.4"
resolved "https://registry.yarnpkg.com/world-atlas/-/world-atlas-1.1.4.tgz#0f53c44f31b66daa245cf673ccfab5c338903682"
+ integrity sha1-D1PETzG2baokXPZzzPq1wziQNoI=
wrappy@1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+ integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-write@^0.2.1:
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+write@1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
+ integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
dependencies:
mkdirp "^0.5.1"