From c0f039f478b5f5bdd9c27623b7c9a92229117874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Thu, 30 Aug 2018 13:29:08 -0400 Subject: [PATCH 1/2] bump regl-splom to 1.0.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - see https://github.com/a-vis/regl-splom/pull/9 for more info Signed-off-by: Étienne Tétreault-Pinard --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2ec7d9ec2bf..4c476da0be8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8863,9 +8863,9 @@ } }, "regl-splom": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/regl-splom/-/regl-splom-1.0.3.tgz", - "integrity": "sha512-3oJT26xm91p303Jb3jMI7PptHYMSbR2/ZnTLolYGnC42jVp/e+xbbik1pTNFyeS5WiaE0M+Ssl3tUC6zgQ8nOw==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/regl-splom/-/regl-splom-1.0.4.tgz", + "integrity": "sha512-+iq/RJAJdHCp48wPbEGQ5qw29OXFVF/m7CzcuLZxwptjdkB/FHGKiMuyqclOSNQcEKFxQTvRRJMJJ6brd8VvrA==", "requires": { "array-bounds": "^1.0.1", "array-range": "^1.0.1", @@ -8878,7 +8878,7 @@ "pick-by-alias": "^1.2.0", "point-cluster": "^1.0.2", "raf": "^3.4.0", - "regl-scatter2d": "^3.0.0" + "regl-scatter2d": "^3.0.6" }, "dependencies": { "binary-search-bounds": { diff --git a/package.json b/package.json index 4a966f70a1a..3d8b82024db 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "regl-error2d": "^2.0.5", "regl-line2d": "^3.0.9", "regl-scatter2d": "^3.0.6", - "regl-splom": "^1.0.3", + "regl-splom": "^1.0.4", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", "sane-topojson": "^2.0.0", From 60d24cf1a87c39dc4cf44ac37ffe8cfeb06e4ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Thu, 30 Aug 2018 13:45:09 -0400 Subject: [PATCH 2/2] replace @etpinard/gl-text -> gl-text --- package-lock.json | 47 ++++++++++++++++++----------------- package.json | 2 +- src/traces/scattergl/index.js | 2 +- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4c476da0be8..3415c2787c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,29 +35,6 @@ "commander": "^2.15.1" } }, - "@etpinard/gl-text": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@etpinard/gl-text/-/gl-text-1.1.6.tgz", - "integrity": "sha512-sN007FwlqdSKJt2/cnGZu3jsAN7G4R/wxk/D6ZivPuQtrwJ42B68iuAqysJPgFepUTAsDRtGAOd1U7tZxfDJwA==", - "requires": { - "color-normalize": "^1.1.0", - "css-font": "^1.2.0", - "detect-kerning": "^2.1.2", - "es6-weak-map": "^2.0.2", - "flatten-vertex-data": "^1.0.2", - "font-atlas": "^2.1.0", - "font-measure": "^1.2.2", - "gl-util": "^3.0.7", - "is-plain-obj": "^1.1.0", - "object-assign": "^4.1.1", - "parse-rect": "^1.2.0", - "parse-unit": "^1.0.1", - "pick-by-alias": "^1.2.0", - "regl": "^1.3.6", - "to-px": "^1.0.1", - "typedarray-pool": "^1.1.0" - } - }, "@mapbox/geojson-area": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/@mapbox/geojson-area/-/geojson-area-0.2.2.tgz", @@ -4867,6 +4844,30 @@ "typedarray-pool": "^1.0.0" } }, + "gl-text": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/gl-text/-/gl-text-1.1.6.tgz", + "integrity": "sha512-OB+Nc5JKO1gyYYqBOJrYvCvRXIecfVpIKP7AviQNY63jrWPM9hUFSwZG7sH/paVnR1yCZBVirqOPfiFeF1Qo4g==", + "requires": { + "bit-twiddle": "^1.0.2", + "color-normalize": "^1.1.0", + "css-font": "^1.2.0", + "detect-kerning": "^2.1.2", + "es6-weak-map": "^2.0.2", + "flatten-vertex-data": "^1.0.2", + "font-atlas": "^2.1.0", + "font-measure": "^1.2.2", + "gl-util": "^3.0.7", + "is-plain-obj": "^1.1.0", + "object-assign": "^4.1.1", + "parse-rect": "^1.2.0", + "parse-unit": "^1.0.1", + "pick-by-alias": "^1.2.0", + "regl": "^1.3.6", + "to-px": "^1.0.1", + "typedarray-pool": "^1.1.0" + } + }, "gl-texture2d": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/gl-texture2d/-/gl-texture2d-2.1.0.tgz", diff --git a/package.json b/package.json index 3d8b82024db..962c5c6ddf2 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,6 @@ }, "dependencies": { "3d-view": "^2.0.0", - "@etpinard/gl-text": "^1.1.6", "@plotly/d3-sankey": "^0.5.0", "alpha-shape": "^1.0.0", "array-range": "^1.0.1", @@ -85,6 +84,7 @@ "gl-spikes2d": "^1.0.1", "gl-streamtube3d": "^1.0.0", "gl-surface3d": "^1.3.5", + "gl-text": "^1.1.6", "glslify": "^6.2.1", "has-hover": "^1.0.1", "has-passive-events": "^1.0.0", diff --git a/src/traces/scattergl/index.js b/src/traces/scattergl/index.js index befc5e468f5..dc4fcb22258 100644 --- a/src/traces/scattergl/index.js +++ b/src/traces/scattergl/index.js @@ -13,7 +13,7 @@ var createLine = require('regl-line2d'); var createError = require('regl-error2d'); var cluster = require('point-cluster'); var arrayRange = require('array-range'); -var Text = require('@etpinard/gl-text'); +var Text = require('gl-text'); var Registry = require('../../registry'); var Lib = require('../../lib');