From 9902368768e80543bbf8d64dc587041735782c9e Mon Sep 17 00:00:00 2001 From: archmoj Date: Mon, 18 Jan 2021 09:46:13 -0500 Subject: [PATCH 1/5] scattergl with no-new-func --- package-lock.json | 99 ++++------------------------------------------- package.json | 4 +- 2 files changed, 10 insertions(+), 93 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8f24af22d2d..0e8a7e90a10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -196,12 +196,10 @@ } }, "@plotly/point-cluster": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/@plotly/point-cluster/-/point-cluster-3.1.9.tgz", - "integrity": "sha512-MwaI6g9scKf68Orpr1pHZ597pYx9uP8UEFXLPbsCmuw3a84obwz6pnMXGc90VhgDNeNiLEdlmuK7CPo+5PIxXw==", + "version": "git://github.com/plotly/point-cluster.git#47d99d990af3741ee30d74f42c83ba5d6d74b509", + "from": "git://github.com/plotly/point-cluster.git#47d99d990af3741ee30d74f42c83ba5d6d74b509", "requires": { "array-bounds": "^1.0.1", - "binary-search-bounds": "^2.0.4", "clamp": "^1.0.1", "defined": "^1.0.0", "dtype": "^2.0.0", @@ -9811,9 +9809,9 @@ }, "dependencies": { "is-buffer": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", - "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", + "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==" } } }, @@ -10163,11 +10161,10 @@ } }, "regl-scatter2d": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/regl-scatter2d/-/regl-scatter2d-3.2.1.tgz", - "integrity": "sha512-qxUCK5kXuoVZin2gPLXkgkBfRr3XLobVgEfn5N0fiprsb/ncTCtSNVBqP0EJgNb115R+FXte9LKA9YrFx7uBnA==", + "version": "git://github.com/gl-vis/regl-scatter2d.git#14876b1f5af6654405055f7dede02164c052163d", + "from": "git://github.com/gl-vis/regl-scatter2d.git#14876b1f5af6654405055f7dede02164c052163d", "requires": { - "@plotly/point-cluster": "^3.1.9", + "@plotly/point-cluster": "git://github.com/plotly/point-cluster.git#47d99d990af3741ee30d74f42c83ba5d6d74b509", "array-range": "^1.0.1", "array-rearrange": "^2.2.2", "clamp": "^1.0.1", @@ -10183,86 +10180,6 @@ "pick-by-alias": "^1.2.0", "to-float32": "^1.0.1", "update-diff": "^1.1.0" - }, - "dependencies": { - "glslify": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/glslify/-/glslify-7.1.1.tgz", - "integrity": "sha512-bud98CJ6kGZcP9Yxcsi7Iz647wuDz3oN+IZsjCRi5X1PI7t/xPKeL0mOwXJjo+CRZMqvq0CkSJiywCcY7kVYog==", - "requires": { - "bl": "^2.2.1", - "concat-stream": "^1.5.2", - "duplexify": "^3.4.5", - "falafel": "^2.1.0", - "from2": "^2.3.0", - "glsl-resolve": "0.0.1", - "glsl-token-whitespace-trim": "^1.0.0", - "glslify-bundle": "^5.0.0", - "glslify-deps": "^1.2.5", - "minimist": "^1.2.5", - "resolve": "^1.1.5", - "stack-trace": "0.0.9", - "static-eval": "^2.0.5", - "through2": "^2.0.1", - "xtend": "^4.0.0" - } - }, - "glslify-deps": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/glslify-deps/-/glslify-deps-1.3.2.tgz", - "integrity": "sha512-7S7IkHWygJRjcawveXQjRXLO2FTjijPDYC7QfZyAQanY+yGLCFHYnPtsGT9bdyHiwPTw/5a1m1M9hamT2aBpag==", - "requires": { - "@choojs/findup": "^0.2.0", - "events": "^3.2.0", - "glsl-resolve": "0.0.1", - "glsl-tokenizer": "^2.0.0", - "graceful-fs": "^4.1.2", - "inherits": "^2.0.1", - "map-limit": "0.0.1", - "resolve": "^1.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "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" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - } } }, "regl-splom": { diff --git a/package.json b/package.json index ad0bf2d7816..94e98b3b8ba 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@plotly/d3": "^3.5.18", "@plotly/d3-sankey": "0.7.2", "@plotly/d3-sankey-circular": "0.33.1", - "@plotly/point-cluster": "^3.1.9", + "@plotly/point-cluster": "git://github.com/plotly/point-cluster.git#47d99d990af3741ee30d74f42c83ba5d6d74b509", "@turf/area": "^6.0.1", "@turf/bbox": "^6.0.1", "@turf/centroid": "^6.0.2", @@ -110,7 +110,7 @@ "regl": "^1.6.1", "regl-error2d": "^2.0.11", "regl-line2d": "^3.1.0", - "regl-scatter2d": "^3.2.1", + "regl-scatter2d": "git://github.com/gl-vis/regl-scatter2d.git#14876b1f5af6654405055f7dede02164c052163d", "regl-splom": "^1.0.12", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", From f5b5afc2ee19a1252479589b57936f52b604d3a0 Mon Sep 17 00:00:00 2001 From: archmoj Date: Mon, 18 Jan 2021 12:03:16 -0500 Subject: [PATCH 2/5] update different package-lock --- package-lock.json | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/package-lock.json b/package-lock.json index 0e8a7e90a10..113c70fb759 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10195,6 +10195,48 @@ "pick-by-alias": "^1.2.0", "raf": "^3.4.1", "regl-scatter2d": "^3.1.9" + }, + "dependencies": { + "@plotly/point-cluster": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/@plotly/point-cluster/-/point-cluster-3.1.9.tgz", + "integrity": "sha512-MwaI6g9scKf68Orpr1pHZ597pYx9uP8UEFXLPbsCmuw3a84obwz6pnMXGc90VhgDNeNiLEdlmuK7CPo+5PIxXw==", + "requires": { + "array-bounds": "^1.0.1", + "binary-search-bounds": "^2.0.4", + "clamp": "^1.0.1", + "defined": "^1.0.0", + "dtype": "^2.0.0", + "flatten-vertex-data": "^1.0.2", + "is-obj": "^1.0.1", + "math-log2": "^1.0.1", + "parse-rect": "^1.2.0", + "pick-by-alias": "^1.2.0" + } + }, + "regl-scatter2d": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/regl-scatter2d/-/regl-scatter2d-3.2.1.tgz", + "integrity": "sha512-qxUCK5kXuoVZin2gPLXkgkBfRr3XLobVgEfn5N0fiprsb/ncTCtSNVBqP0EJgNb115R+FXte9LKA9YrFx7uBnA==", + "requires": { + "@plotly/point-cluster": "^3.1.9", + "array-range": "^1.0.1", + "array-rearrange": "^2.2.2", + "clamp": "^1.0.1", + "color-id": "^1.1.0", + "color-normalize": "^1.5.0", + "color-rgba": "^2.1.1", + "flatten-vertex-data": "^1.0.2", + "glslify": "^7.0.0", + "image-palette": "^2.1.0", + "is-iexplorer": "^1.0.0", + "object-assign": "^4.1.1", + "parse-rect": "^1.2.0", + "pick-by-alias": "^1.2.0", + "to-float32": "^1.0.1", + "update-diff": "^1.1.0" + } + } } }, "remove-trailing-separator": { From 863bcd1f46dec67bd30b38530dba1864dd073aa0 Mon Sep 17 00:00:00 2001 From: archmoj Date: Mon, 18 Jan 2021 12:47:41 -0500 Subject: [PATCH 3/5] update regl-scatter2d in regl-splom --- package-lock.json | 49 +++-------------------------------------------- package.json | 2 +- 2 files changed, 4 insertions(+), 47 deletions(-) diff --git a/package-lock.json b/package-lock.json index 113c70fb759..af7e6fc4fdf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10183,9 +10183,8 @@ } }, "regl-splom": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/regl-splom/-/regl-splom-1.0.12.tgz", - "integrity": "sha512-LliMmAQ6wJFuPiLxZgYOFOzjhWcrIWPbS3Vf763Twl6R8eKpuUyRHZ54q+hxWGYwICHoPCBKMs7pVAJi8Iv7/w==", + "version": "git://github.com/gl-vis/regl-splom.git#842cfedbd3a791b6b825895fae291f3906ee4f7d", + "from": "git://github.com/gl-vis/regl-splom.git#842cfedbd3a791b6b825895fae291f3906ee4f7d", "requires": { "array-bounds": "^1.0.1", "array-range": "^1.0.1", @@ -10194,49 +10193,7 @@ "parse-rect": "^1.2.0", "pick-by-alias": "^1.2.0", "raf": "^3.4.1", - "regl-scatter2d": "^3.1.9" - }, - "dependencies": { - "@plotly/point-cluster": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/@plotly/point-cluster/-/point-cluster-3.1.9.tgz", - "integrity": "sha512-MwaI6g9scKf68Orpr1pHZ597pYx9uP8UEFXLPbsCmuw3a84obwz6pnMXGc90VhgDNeNiLEdlmuK7CPo+5PIxXw==", - "requires": { - "array-bounds": "^1.0.1", - "binary-search-bounds": "^2.0.4", - "clamp": "^1.0.1", - "defined": "^1.0.0", - "dtype": "^2.0.0", - "flatten-vertex-data": "^1.0.2", - "is-obj": "^1.0.1", - "math-log2": "^1.0.1", - "parse-rect": "^1.2.0", - "pick-by-alias": "^1.2.0" - } - }, - "regl-scatter2d": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/regl-scatter2d/-/regl-scatter2d-3.2.1.tgz", - "integrity": "sha512-qxUCK5kXuoVZin2gPLXkgkBfRr3XLobVgEfn5N0fiprsb/ncTCtSNVBqP0EJgNb115R+FXte9LKA9YrFx7uBnA==", - "requires": { - "@plotly/point-cluster": "^3.1.9", - "array-range": "^1.0.1", - "array-rearrange": "^2.2.2", - "clamp": "^1.0.1", - "color-id": "^1.1.0", - "color-normalize": "^1.5.0", - "color-rgba": "^2.1.1", - "flatten-vertex-data": "^1.0.2", - "glslify": "^7.0.0", - "image-palette": "^2.1.0", - "is-iexplorer": "^1.0.0", - "object-assign": "^4.1.1", - "parse-rect": "^1.2.0", - "pick-by-alias": "^1.2.0", - "to-float32": "^1.0.1", - "update-diff": "^1.1.0" - } - } + "regl-scatter2d": "git://github.com/gl-vis/regl-scatter2d.git#14876b1f5af6654405055f7dede02164c052163d" } }, "remove-trailing-separator": { diff --git a/package.json b/package.json index 94e98b3b8ba..5f1436668b3 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "regl-error2d": "^2.0.11", "regl-line2d": "^3.1.0", "regl-scatter2d": "git://github.com/gl-vis/regl-scatter2d.git#14876b1f5af6654405055f7dede02164c052163d", - "regl-splom": "^1.0.12", + "regl-splom": "git://github.com/gl-vis/regl-splom.git#842cfedbd3a791b6b825895fae291f3906ee4f7d", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", "sane-topojson": "^4.0.0", From 91e5cb855d653c4df8575c89553d1b56da40504d Mon Sep 17 00:00:00 2001 From: archmoj Date: Mon, 18 Jan 2021 16:02:46 -0500 Subject: [PATCH 4/5] bump point-cluster regl-scatter2d and regl-splom packages --- package-lock.json | 19 +++++++++++-------- package.json | 6 +++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index af7e6fc4fdf..ea63dd996f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -196,8 +196,9 @@ } }, "@plotly/point-cluster": { - "version": "git://github.com/plotly/point-cluster.git#47d99d990af3741ee30d74f42c83ba5d6d74b509", - "from": "git://github.com/plotly/point-cluster.git#47d99d990af3741ee30d74f42c83ba5d6d74b509", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@plotly/point-cluster/-/point-cluster-4.0.0.tgz", + "integrity": "sha512-6M5QVU6/uH2E1PmIJ46a2GKRgX1lBUxkEblRosOQ6APmr6vvWh0irinvWCAcGyN0EWfQrvpeAEvYn6rOpC5x6A==", "requires": { "array-bounds": "^1.0.1", "clamp": "^1.0.1", @@ -10161,10 +10162,11 @@ } }, "regl-scatter2d": { - "version": "git://github.com/gl-vis/regl-scatter2d.git#14876b1f5af6654405055f7dede02164c052163d", - "from": "git://github.com/gl-vis/regl-scatter2d.git#14876b1f5af6654405055f7dede02164c052163d", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/regl-scatter2d/-/regl-scatter2d-3.2.2.tgz", + "integrity": "sha512-Lr6qFOhsKa1twlYN/g1KrLc8XwWK0T57H4wqLQf4dFSKZ3Z/jbpL+iUTdqddgT8b1L3rncaHGs4EHAgOp44FVg==", "requires": { - "@plotly/point-cluster": "git://github.com/plotly/point-cluster.git#47d99d990af3741ee30d74f42c83ba5d6d74b509", + "@plotly/point-cluster": "^4.0.0", "array-range": "^1.0.1", "array-rearrange": "^2.2.2", "clamp": "^1.0.1", @@ -10183,8 +10185,9 @@ } }, "regl-splom": { - "version": "git://github.com/gl-vis/regl-splom.git#842cfedbd3a791b6b825895fae291f3906ee4f7d", - "from": "git://github.com/gl-vis/regl-splom.git#842cfedbd3a791b6b825895fae291f3906ee4f7d", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/regl-splom/-/regl-splom-1.0.13.tgz", + "integrity": "sha512-UG9BuWLj/fZHFTEuKhWLXqh24bLOoU75fMAHEyKLFjzoIm9mK43soXc75F2j+lDEnI+6tW4MNRs3NmPhKhdoOQ==", "requires": { "array-bounds": "^1.0.1", "array-range": "^1.0.1", @@ -10193,7 +10196,7 @@ "parse-rect": "^1.2.0", "pick-by-alias": "^1.2.0", "raf": "^3.4.1", - "regl-scatter2d": "git://github.com/gl-vis/regl-scatter2d.git#14876b1f5af6654405055f7dede02164c052163d" + "regl-scatter2d": "^3.2.2" } }, "remove-trailing-separator": { diff --git a/package.json b/package.json index 5f1436668b3..325db075b9c 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@plotly/d3": "^3.5.18", "@plotly/d3-sankey": "0.7.2", "@plotly/d3-sankey-circular": "0.33.1", - "@plotly/point-cluster": "git://github.com/plotly/point-cluster.git#47d99d990af3741ee30d74f42c83ba5d6d74b509", + "@plotly/point-cluster": "^4.0.0", "@turf/area": "^6.0.1", "@turf/bbox": "^6.0.1", "@turf/centroid": "^6.0.2", @@ -110,8 +110,8 @@ "regl": "^1.6.1", "regl-error2d": "^2.0.11", "regl-line2d": "^3.1.0", - "regl-scatter2d": "git://github.com/gl-vis/regl-scatter2d.git#14876b1f5af6654405055f7dede02164c052163d", - "regl-splom": "git://github.com/gl-vis/regl-splom.git#842cfedbd3a791b6b825895fae291f3906ee4f7d", + "regl-scatter2d": "^3.2.2", + "regl-splom": "^1.0.13", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", "sane-topojson": "^4.0.0", From bb23b67095375fd3e474fb628683ac15bebce692 Mon Sep 17 00:00:00 2001 From: archmoj Date: Tue, 19 Jan 2021 10:14:58 -0500 Subject: [PATCH 5/5] use reverted scattergl and splom packages and maintain point-cluster at v3 --- package-lock.json | 23 ++++++++++++----------- package.json | 6 +++--- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index ea63dd996f7..93fbfa8ee84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -196,11 +196,12 @@ } }, "@plotly/point-cluster": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@plotly/point-cluster/-/point-cluster-4.0.0.tgz", - "integrity": "sha512-6M5QVU6/uH2E1PmIJ46a2GKRgX1lBUxkEblRosOQ6APmr6vvWh0irinvWCAcGyN0EWfQrvpeAEvYn6rOpC5x6A==", + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/@plotly/point-cluster/-/point-cluster-3.1.9.tgz", + "integrity": "sha512-MwaI6g9scKf68Orpr1pHZ597pYx9uP8UEFXLPbsCmuw3a84obwz6pnMXGc90VhgDNeNiLEdlmuK7CPo+5PIxXw==", "requires": { "array-bounds": "^1.0.1", + "binary-search-bounds": "^2.0.4", "clamp": "^1.0.1", "defined": "^1.0.0", "dtype": "^2.0.0", @@ -10162,11 +10163,11 @@ } }, "regl-scatter2d": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/regl-scatter2d/-/regl-scatter2d-3.2.2.tgz", - "integrity": "sha512-Lr6qFOhsKa1twlYN/g1KrLc8XwWK0T57H4wqLQf4dFSKZ3Z/jbpL+iUTdqddgT8b1L3rncaHGs4EHAgOp44FVg==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/regl-scatter2d/-/regl-scatter2d-3.2.3.tgz", + "integrity": "sha512-wURiMVjNrcBoED0SMYH9Accs0CovdnBWWuzH/WgT0kuJ3kDzia1vhmEUA2JZ/beozalARkFAy/C2K/4Nd1eZqQ==", "requires": { - "@plotly/point-cluster": "^4.0.0", + "@plotly/point-cluster": "^3.1.9", "array-range": "^1.0.1", "array-rearrange": "^2.2.2", "clamp": "^1.0.1", @@ -10185,9 +10186,9 @@ } }, "regl-splom": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/regl-splom/-/regl-splom-1.0.13.tgz", - "integrity": "sha512-UG9BuWLj/fZHFTEuKhWLXqh24bLOoU75fMAHEyKLFjzoIm9mK43soXc75F2j+lDEnI+6tW4MNRs3NmPhKhdoOQ==", + "version": "1.0.14", + "resolved": "https://registry.npmjs.org/regl-splom/-/regl-splom-1.0.14.tgz", + "integrity": "sha512-OiLqjmPRYbd7kDlHC6/zDf6L8lxgDC65BhC8JirhP4ykrK4x22ZyS+BnY8EUinXKDeMgmpRwCvUmk7BK4Nweuw==", "requires": { "array-bounds": "^1.0.1", "array-range": "^1.0.1", @@ -10196,7 +10197,7 @@ "parse-rect": "^1.2.0", "pick-by-alias": "^1.2.0", "raf": "^3.4.1", - "regl-scatter2d": "^3.2.2" + "regl-scatter2d": "^3.2.3" } }, "remove-trailing-separator": { diff --git a/package.json b/package.json index 325db075b9c..e3a05368405 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@plotly/d3": "^3.5.18", "@plotly/d3-sankey": "0.7.2", "@plotly/d3-sankey-circular": "0.33.1", - "@plotly/point-cluster": "^4.0.0", + "@plotly/point-cluster": "^3.1.9", "@turf/area": "^6.0.1", "@turf/bbox": "^6.0.1", "@turf/centroid": "^6.0.2", @@ -110,8 +110,8 @@ "regl": "^1.6.1", "regl-error2d": "^2.0.11", "regl-line2d": "^3.1.0", - "regl-scatter2d": "^3.2.2", - "regl-splom": "^1.0.13", + "regl-scatter2d": "^3.2.3", + "regl-splom": "^1.0.14", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", "sane-topojson": "^4.0.0",