From 333fffe4721176950f9ec19cd6d172e9c317c184 Mon Sep 17 00:00:00 2001 From: archmoj Date: Mon, 31 Dec 2018 09:48:00 -0500 Subject: [PATCH 1/2] fix modules for issue 3379 --- package-lock.json | 44 +++++++++++++++++++------------------------- package.json | 6 +++--- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index 964f3b3e8ae..9581fe3dd57 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4700,9 +4700,8 @@ } }, "gl-axes3d": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/gl-axes3d/-/gl-axes3d-1.4.2.tgz", - "integrity": "sha512-gDqYKiMYEUpF6DQ7i7qrRkI09c5DUdQLG75rDDO3bPZA57XDCh7DqbQCdyBzxSqOCOSF9v53mSI/dlmM3bzuEQ==", + "version": "git://github.com/gl-vis/gl-axes3d.git#e47086ddf100d8b21633718fa9cedd669b387a84", + "from": "git://github.com/gl-vis/gl-axes3d.git#e47086ddf100d8b21633718fa9cedd669b387a84", "requires": { "bit-twiddle": "^1.0.0", "dup": "^1.0.0", @@ -4716,7 +4715,7 @@ "glslify": "^6.1.0", "robust-orientation": "^1.1.3", "split-polygon": "^1.0.0", - "vectorize-text": "^3.2.0" + "vectorize-text": "git://github.com/archmoj/vectorize-text.git#4733c6e3787e8be675b3057deb27d466775d359a" } }, "gl-buffer": { @@ -4885,9 +4884,8 @@ } }, "gl-plot2d": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/gl-plot2d/-/gl-plot2d-1.4.0.tgz", - "integrity": "sha512-cO1R6TSMHZKxpsxT2jSxxZ/sN6KdkPLvpzp1t5W5qB5xUs4RiTmAw1jd9s1ogdZYBqYJVIrj6ktCrua3Ligc+Q==", + "version": "git://github.com/gl-vis/gl-plot2d.git#6cffe093e4af2e72e9aa8849c44231322a3c893c", + "from": "git://github.com/gl-vis/gl-plot2d.git#6cffe093e4af2e72e9aa8849c44231322a3c893c", "requires": { "binary-search-bounds": "^2.0.3", "gl-buffer": "^2.1.2", @@ -4895,7 +4893,7 @@ "gl-shader": "^4.2.1", "glsl-inverse": "^1.0.0", "glslify": "^6.1.0", - "text-cache": "^4.2.0" + "text-cache": "git://github.com/gl-vis/text-cache.git#f520d30f73881c02ecf50bf57f593559bdd50cef" }, "dependencies": { "binary-search-bounds": { @@ -4906,13 +4904,12 @@ } }, "gl-plot3d": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/gl-plot3d/-/gl-plot3d-1.6.1.tgz", - "integrity": "sha512-w93IiAm1xM+VIRunFs6opcLIgnbrdCSg9Lfg4jLp7m3e3qHCn3LyUCrG8qT1qW2HMLje9dCWnZmZyMb7Vbx24g==", + "version": "git://github.com/gl-vis/gl-plot3d.git#bc4c7b7b9c8f27018ca2eb56e7c9d3898adbe681", + "from": "git://github.com/gl-vis/gl-plot3d.git#bc4c7b7b9c8f27018ca2eb56e7c9d3898adbe681", "requires": { "3d-view-controls": "^2.2.0", "a-big-triangle": "^1.0.0", - "gl-axes3d": "^1.4.2", + "gl-axes3d": "git://github.com/gl-vis/gl-axes3d.git#e47086ddf100d8b21633718fa9cedd669b387a84", "gl-fbo": "^2.0.3", "gl-mat4": "^1.1.2", "gl-select-static": "^2.0.2", @@ -4946,9 +4943,8 @@ } }, "gl-scatter3d": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/gl-scatter3d/-/gl-scatter3d-1.1.2.tgz", - "integrity": "sha512-gxLYR2Etqi9JodqH4TLBBpys+B5R6/IbRrN64uk81rR6K2TTyYM9LOaPVFSinFnRXeQzRwPtvjfcBHmf085i3A==", + "version": "git://github.com/gl-vis/gl-scatter3d.git#b8891b456577dbafd45ceaaa9f425b6189c44824", + "from": "git://github.com/gl-vis/gl-scatter3d.git#b8891b456577dbafd45ceaaa9f425b6189c44824", "requires": { "gl-buffer": "^2.0.6", "gl-mat4": "^1.0.0", @@ -4972,9 +4968,9 @@ } }, "gl-select-static": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/gl-select-static/-/gl-select-static-2.0.2.tgz", - "integrity": "sha1-8+GQHfAxgdUy55WFMjBnnUr1fuk=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/gl-select-static/-/gl-select-static-2.0.3.tgz", + "integrity": "sha512-lV+Bne1q771KUGFJOeHM15dnouzO9IV/amlmGhq3xRxdKABFtfzPEuunm4IOF4HJvbRBz0fY/KTb0yz9QpzrZg==", "requires": { "bit-twiddle": "^1.0.2", "cwise": "^1.0.3", @@ -11338,11 +11334,10 @@ } }, "text-cache": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/text-cache/-/text-cache-4.2.0.tgz", - "integrity": "sha512-8+W9fHZYOamWTy0Yb7lxMszOWo6sqUT4XvwrCZfaGxM8C8uzOoTQWXgtr/jDpuwozQhKNS3AxnuIaYc1SvV8vg==", + "version": "git://github.com/gl-vis/text-cache.git#f520d30f73881c02ecf50bf57f593559bdd50cef", + "from": "git://github.com/gl-vis/text-cache.git#f520d30f73881c02ecf50bf57f593559bdd50cef", "requires": { - "vectorize-text": "^3.2.0" + "vectorize-text": "git://github.com/archmoj/vectorize-text.git#4733c6e3787e8be675b3057deb27d466775d359a" } }, "text-table": { @@ -12097,9 +12092,8 @@ "integrity": "sha1-uBNbn7E3K94C/dU60dDM1t55j+4=" }, "vectorize-text": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/vectorize-text/-/vectorize-text-3.2.0.tgz", - "integrity": "sha512-N3eldFPkXY7mVK1aBuKPdQKYerBSPEAf+4Tl6DGdnVb1MZ8buD9SKv5TUCyRCEe5KblC56MoJcmf0I/IyGjOGQ==", + "version": "git://github.com/archmoj/vectorize-text.git#4733c6e3787e8be675b3057deb27d466775d359a", + "from": "git://github.com/archmoj/vectorize-text.git#4733c6e3787e8be675b3057deb27d466775d359a", "requires": { "cdt2d": "^1.0.0", "clean-pslg": "^1.1.0", diff --git a/package.json b/package.json index 3a79fbd4438..70a21d2b2c6 100644 --- a/package.json +++ b/package.json @@ -78,10 +78,10 @@ "gl-line3d": "^1.1.6", "gl-mat4": "^1.2.0", "gl-mesh3d": "^2.0.2", - "gl-plot2d": "^1.4.0", - "gl-plot3d": "^1.6.1", + "gl-plot2d": "git://github.com/gl-vis/gl-plot2d.git#6cffe093e4af2e72e9aa8849c44231322a3c893c", + "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#bc4c7b7b9c8f27018ca2eb56e7c9d3898adbe681", "gl-pointcloud2d": "^1.0.1", - "gl-scatter3d": "^1.1.2", + "gl-scatter3d": "git://github.com/gl-vis/gl-scatter3d.git#b8891b456577dbafd45ceaaa9f425b6189c44824", "gl-select-box": "^1.0.2", "gl-spikes2d": "^1.0.1", "gl-streamtube3d": "^1.1.1", From 6c941bbe84d6cfb64e454591241368eb7440b3ee Mon Sep 17 00:00:00 2001 From: archmoj Date: Mon, 31 Dec 2018 10:29:07 -0500 Subject: [PATCH 2/2] fix for issue 3379 vectorize-text error --- package-lock.json | 34 +++++++++++++++++----------------- package.json | 6 +++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9581fe3dd57..b64796da020 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4700,8 +4700,8 @@ } }, "gl-axes3d": { - "version": "git://github.com/gl-vis/gl-axes3d.git#e47086ddf100d8b21633718fa9cedd669b387a84", - "from": "git://github.com/gl-vis/gl-axes3d.git#e47086ddf100d8b21633718fa9cedd669b387a84", + "version": "git://github.com/gl-vis/gl-axes3d.git#51081c167dd8ce8d5a0a2434cae3620cee58eb2b", + "from": "git://github.com/gl-vis/gl-axes3d.git#51081c167dd8ce8d5a0a2434cae3620cee58eb2b", "requires": { "bit-twiddle": "^1.0.0", "dup": "^1.0.0", @@ -4715,7 +4715,7 @@ "glslify": "^6.1.0", "robust-orientation": "^1.1.3", "split-polygon": "^1.0.0", - "vectorize-text": "git://github.com/archmoj/vectorize-text.git#4733c6e3787e8be675b3057deb27d466775d359a" + "vectorize-text": "git://github.com/archmoj/vectorize-text.git#805784cb822eb29096555be6d047b45370650e9e" } }, "gl-buffer": { @@ -4884,8 +4884,8 @@ } }, "gl-plot2d": { - "version": "git://github.com/gl-vis/gl-plot2d.git#6cffe093e4af2e72e9aa8849c44231322a3c893c", - "from": "git://github.com/gl-vis/gl-plot2d.git#6cffe093e4af2e72e9aa8849c44231322a3c893c", + "version": "git://github.com/gl-vis/gl-plot2d.git#40229bfa19a407cd95d20ff4b61077a7bdb4ab8d", + "from": "git://github.com/gl-vis/gl-plot2d.git#40229bfa19a407cd95d20ff4b61077a7bdb4ab8d", "requires": { "binary-search-bounds": "^2.0.3", "gl-buffer": "^2.1.2", @@ -4893,7 +4893,7 @@ "gl-shader": "^4.2.1", "glsl-inverse": "^1.0.0", "glslify": "^6.1.0", - "text-cache": "git://github.com/gl-vis/text-cache.git#f520d30f73881c02ecf50bf57f593559bdd50cef" + "text-cache": "git://github.com/gl-vis/text-cache.git#ad76b0738258922c830bb518903f773198d14817" }, "dependencies": { "binary-search-bounds": { @@ -4904,12 +4904,12 @@ } }, "gl-plot3d": { - "version": "git://github.com/gl-vis/gl-plot3d.git#bc4c7b7b9c8f27018ca2eb56e7c9d3898adbe681", - "from": "git://github.com/gl-vis/gl-plot3d.git#bc4c7b7b9c8f27018ca2eb56e7c9d3898adbe681", + "version": "git://github.com/gl-vis/gl-plot3d.git#53766150a8c31df9a3d51727b827579e914524a3", + "from": "git://github.com/gl-vis/gl-plot3d.git#53766150a8c31df9a3d51727b827579e914524a3", "requires": { "3d-view-controls": "^2.2.0", "a-big-triangle": "^1.0.0", - "gl-axes3d": "git://github.com/gl-vis/gl-axes3d.git#e47086ddf100d8b21633718fa9cedd669b387a84", + "gl-axes3d": "git://github.com/gl-vis/gl-axes3d.git#51081c167dd8ce8d5a0a2434cae3620cee58eb2b", "gl-fbo": "^2.0.3", "gl-mat4": "^1.1.2", "gl-select-static": "^2.0.2", @@ -4943,8 +4943,8 @@ } }, "gl-scatter3d": { - "version": "git://github.com/gl-vis/gl-scatter3d.git#b8891b456577dbafd45ceaaa9f425b6189c44824", - "from": "git://github.com/gl-vis/gl-scatter3d.git#b8891b456577dbafd45ceaaa9f425b6189c44824", + "version": "git://github.com/gl-vis/gl-scatter3d.git#eebb85ac780886c4551ffdd1e0cae94ea8faa572", + "from": "git://github.com/gl-vis/gl-scatter3d.git#eebb85ac780886c4551ffdd1e0cae94ea8faa572", "requires": { "gl-buffer": "^2.0.6", "gl-mat4": "^1.0.0", @@ -4954,7 +4954,7 @@ "glslify": "^6.1.0", "is-string-blank": "^1.0.1", "typedarray-pool": "^1.0.2", - "vectorize-text": "^3.2.0" + "vectorize-text": "git://github.com/archmoj/vectorize-text.git#805784cb822eb29096555be6d047b45370650e9e" } }, "gl-select-box": { @@ -11334,10 +11334,10 @@ } }, "text-cache": { - "version": "git://github.com/gl-vis/text-cache.git#f520d30f73881c02ecf50bf57f593559bdd50cef", - "from": "git://github.com/gl-vis/text-cache.git#f520d30f73881c02ecf50bf57f593559bdd50cef", + "version": "git://github.com/gl-vis/text-cache.git#ad76b0738258922c830bb518903f773198d14817", + "from": "git://github.com/gl-vis/text-cache.git#ad76b0738258922c830bb518903f773198d14817", "requires": { - "vectorize-text": "git://github.com/archmoj/vectorize-text.git#4733c6e3787e8be675b3057deb27d466775d359a" + "vectorize-text": "git://github.com/archmoj/vectorize-text.git#805784cb822eb29096555be6d047b45370650e9e" } }, "text-table": { @@ -12092,8 +12092,8 @@ "integrity": "sha1-uBNbn7E3K94C/dU60dDM1t55j+4=" }, "vectorize-text": { - "version": "git://github.com/archmoj/vectorize-text.git#4733c6e3787e8be675b3057deb27d466775d359a", - "from": "git://github.com/archmoj/vectorize-text.git#4733c6e3787e8be675b3057deb27d466775d359a", + "version": "git://github.com/archmoj/vectorize-text.git#805784cb822eb29096555be6d047b45370650e9e", + "from": "git://github.com/archmoj/vectorize-text.git#805784cb822eb29096555be6d047b45370650e9e", "requires": { "cdt2d": "^1.0.0", "clean-pslg": "^1.1.0", diff --git a/package.json b/package.json index 70a21d2b2c6..caf427b7d1d 100644 --- a/package.json +++ b/package.json @@ -78,10 +78,10 @@ "gl-line3d": "^1.1.6", "gl-mat4": "^1.2.0", "gl-mesh3d": "^2.0.2", - "gl-plot2d": "git://github.com/gl-vis/gl-plot2d.git#6cffe093e4af2e72e9aa8849c44231322a3c893c", - "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#bc4c7b7b9c8f27018ca2eb56e7c9d3898adbe681", + "gl-plot2d": "git://github.com/gl-vis/gl-plot2d.git#40229bfa19a407cd95d20ff4b61077a7bdb4ab8d", + "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#53766150a8c31df9a3d51727b827579e914524a3", "gl-pointcloud2d": "^1.0.1", - "gl-scatter3d": "git://github.com/gl-vis/gl-scatter3d.git#b8891b456577dbafd45ceaaa9f425b6189c44824", + "gl-scatter3d": "git://github.com/gl-vis/gl-scatter3d.git#eebb85ac780886c4551ffdd1e0cae94ea8faa572", "gl-select-box": "^1.0.2", "gl-spikes2d": "^1.0.1", "gl-streamtube3d": "^1.1.1",