From 2649634d27658a46dd0e69a842a25efa25ea515c Mon Sep 17 00:00:00 2001 From: archmoj Date: Fri, 30 Jul 2021 17:41:49 -0400 Subject: [PATCH 1/6] bump regl to v2.1.0 --- package-lock.json | 13 ++++++++++--- package.json | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9031d5a2bc..4686ef5d4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5499,6 +5499,13 @@ "regl": "^1.3.11", "to-px": "^1.0.1", "typedarray-pool": "^1.1.0" + }, + "dependencies": { + "regl": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/regl/-/regl-1.7.0.tgz", + "integrity": "sha512-bEAtp/qrtKucxXSJkD4ebopFZYP0q1+3Vb2WECWv/T8yQEgKxDxJ7ztO285tAMaYZVR6mM1GgI6CCn8FROtL1w==" + } } }, "gl-texture2d": { @@ -8722,9 +8729,9 @@ } }, "regl": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/regl/-/regl-1.6.1.tgz", - "integrity": "sha512-7Z9rmpEqmLNwC9kCYCyfyu47eWZaQWeNpwZfwz99QueXN8B/Ow40DB0N+OeUeM/yu9pZAB01+JgJ+XghGveVoA==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/regl/-/regl-2.1.0.tgz", + "integrity": "sha512-oWUce/aVoEvW5l2V0LK7O5KJMzUSKeiOwFuJehzpSFd43dO5spP9r+sSUfhKtsky4u6MCqWJaRL+abzExynfTg==" }, "regl-error2d": { "version": "2.0.12", diff --git a/package.json b/package.json index eef09202e1..593f059d44 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "parse-svg-path": "^0.1.2", "polybooljs": "^1.2.0", "probe-image-size": "^7.2.1", - "regl": "^1.6.1", + "regl": "^2.1.0", "regl-error2d": "^2.0.12", "regl-line2d": "^3.1.1", "regl-scatter2d": "^3.2.6", From 0854722977ec2e89e7ec3f1e8c2f9450712ec887 Mon Sep 17 00:00:00 2001 From: archmoj Date: Fri, 30 Jul 2021 18:21:34 -0400 Subject: [PATCH 2/6] log for PR 5870 --- draftlogs/5870_change.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 draftlogs/5870_change.md diff --git a/draftlogs/5870_change.md b/draftlogs/5870_change.md new file mode 100644 index 0000000000..514afc3a70 --- /dev/null +++ b/draftlogs/5870_change.md @@ -0,0 +1 @@ + - Upgrade `regl` module from version 1.6.1 to version 2.1.0 [[#5870](https://github.com/plotly/plotly.js/pull/5870)] From d89053b6ff398dfc2fdb6159943a65da6392e2aa Mon Sep 17 00:00:00 2001 From: archmoj Date: Fri, 30 Jul 2021 18:33:49 -0400 Subject: [PATCH 3/6] link to gl-text using regl-v2 --- package-lock.json | 20 ++++++-------------- package.json | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4686ef5d4c..d6707bdc22 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5478,9 +5478,8 @@ } }, "gl-text": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/gl-text/-/gl-text-1.1.8.tgz", - "integrity": "sha512-whnq9DEFYbW92C4ONwk2eT0YkzmVPHoADnEtuzMOmit87XhgAhBrNs3lK9EgGjU/MoWYvlF6RkI8Kl7Yuo1hUw==", + "version": "git://github.com/gl-vis/gl-text.git#e215cddf18bda17d8a0d4960d03b4b30fe7cc9df", + "from": "git://github.com/gl-vis/gl-text.git#e215cddf18bda17d8a0d4960d03b4b30fe7cc9df", "requires": { "bit-twiddle": "^1.0.2", "color-normalize": "^1.5.0", @@ -5496,16 +5495,9 @@ "parse-rect": "^1.2.0", "parse-unit": "^1.0.1", "pick-by-alias": "^1.2.0", - "regl": "^1.3.11", + "regl": "^2.0.0", "to-px": "^1.0.1", "typedarray-pool": "^1.1.0" - }, - "dependencies": { - "regl": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/regl/-/regl-1.7.0.tgz", - "integrity": "sha512-bEAtp/qrtKucxXSJkD4ebopFZYP0q1+3Vb2WECWv/T8yQEgKxDxJ7ztO285tAMaYZVR6mM1GgI6CCn8FROtL1w==" - } } }, "gl-texture2d": { @@ -5519,9 +5511,9 @@ } }, "gl-util": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/gl-util/-/gl-util-3.1.2.tgz", - "integrity": "sha512-8czWhGTGp/H4S35X1UxGbFlJ1hjtTFhm2mc85GcymEi1CDf633WJgtkCddEiSjIa4BnNxBrqOIhj6jlF6naPqw==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/gl-util/-/gl-util-3.1.3.tgz", + "integrity": "sha512-dvRTggw5MSkJnCbh74jZzSoTOGnVYK+Bt+Ckqm39CVcl6+zSsxqWk4lr5NKhkqXHL6qvZAU9h17ZF8mIskY9mA==", "requires": { "is-browser": "^2.0.1", "is-firefox": "^1.0.3", diff --git a/package.json b/package.json index 593f059d44..d5b24eac10 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "gl-spikes2d": "^1.0.2", "gl-streamtube3d": "^1.4.1", "gl-surface3d": "^1.6.0", - "gl-text": "^1.1.8", + "gl-text": "git://github.com/gl-vis/gl-text.git#e215cddf18bda17d8a0d4960d03b4b30fe7cc9df", "glslify": "^7.1.1", "has-hover": "^1.0.1", "has-passive-events": "^1.0.0", From 7fb200626383dea4c5e367418fbf360464e0330b Mon Sep 17 00:00:00 2001 From: archmoj Date: Mon, 2 Aug 2021 16:21:08 -0400 Subject: [PATCH 4/6] fixed missing dist in gl-text --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d6707bdc22..67a8d53762 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5478,8 +5478,8 @@ } }, "gl-text": { - "version": "git://github.com/gl-vis/gl-text.git#e215cddf18bda17d8a0d4960d03b4b30fe7cc9df", - "from": "git://github.com/gl-vis/gl-text.git#e215cddf18bda17d8a0d4960d03b4b30fe7cc9df", + "version": "git://github.com/gl-vis/gl-text.git#6ae296c411d8611b548057adbb9ff126b590638f", + "from": "git://github.com/gl-vis/gl-text.git#6ae296c411d8611b548057adbb9ff126b590638f", "requires": { "bit-twiddle": "^1.0.2", "color-normalize": "^1.5.0", diff --git a/package.json b/package.json index d5b24eac10..5c677d858c 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "gl-spikes2d": "^1.0.2", "gl-streamtube3d": "^1.4.1", "gl-surface3d": "^1.6.0", - "gl-text": "git://github.com/gl-vis/gl-text.git#e215cddf18bda17d8a0d4960d03b4b30fe7cc9df", + "gl-text": "git://github.com/gl-vis/gl-text.git#6ae296c411d8611b548057adbb9ff126b590638f", "glslify": "^7.1.1", "has-hover": "^1.0.1", "has-passive-events": "^1.0.0", From da5dc0aa0100e83bdc2a9653c1b73a0819b3b2d7 Mon Sep 17 00:00:00 2001 From: archmoj Date: Tue, 3 Aug 2021 10:54:42 -0400 Subject: [PATCH 5/6] bump gl-text v1.2.0 --- package-lock.json | 5 +++-- package.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 67a8d53762..52afab5715 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5478,8 +5478,9 @@ } }, "gl-text": { - "version": "git://github.com/gl-vis/gl-text.git#6ae296c411d8611b548057adbb9ff126b590638f", - "from": "git://github.com/gl-vis/gl-text.git#6ae296c411d8611b548057adbb9ff126b590638f", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gl-text/-/gl-text-1.2.0.tgz", + "integrity": "sha512-1X5yL8wKjyVMPenPKe7UvDAgyAOstuQ9gRfDBI3OK7ZHqHEnatTT5NaHWoY+II2ZHE35DvePxnOuayukowF0Ow==", "requires": { "bit-twiddle": "^1.0.2", "color-normalize": "^1.5.0", diff --git a/package.json b/package.json index 5c677d858c..20dfa1a0b6 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "gl-spikes2d": "^1.0.2", "gl-streamtube3d": "^1.4.1", "gl-surface3d": "^1.6.0", - "gl-text": "git://github.com/gl-vis/gl-text.git#6ae296c411d8611b548057adbb9ff126b590638f", + "gl-text": "1.2.0", "glslify": "^7.1.1", "has-hover": "^1.0.1", "has-passive-events": "^1.0.0", From 3a5ccd493a1571bfcbbe5eabccd3b08430095994 Mon Sep 17 00:00:00 2001 From: archmoj Date: Tue, 3 Aug 2021 10:57:08 -0400 Subject: [PATCH 6/6] adjust gl-text version in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 20dfa1a0b6..dcf5ad8cd7 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "gl-spikes2d": "^1.0.2", "gl-streamtube3d": "^1.4.1", "gl-surface3d": "^1.6.0", - "gl-text": "1.2.0", + "gl-text": "^1.2.0", "glslify": "^7.1.1", "has-hover": "^1.0.1", "has-passive-events": "^1.0.0",