Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Bug] Resolve deck luma version conflict (#955)
Shan Heba4d80166ec9
diff --git a/package.json b/package.jsonindex a78fc47f6..cea1d518c 100644--- a/package.json+++ b/package.json@@ -71,15 +71,15 @@"umd"],"dependencies": {- "@deck.gl/extensions": "8.1.0-alpha.2",- "@deck.gl/core": "8.1.0-alpha.2",- "@deck.gl/layers": "8.1.0-alpha.2",- "@deck.gl/aggregation-layers": "8.1.0-alpha.2",- "@deck.gl/mesh-layers": "8.1.0-alpha.2",- "@deck.gl/react": "8.1.0-alpha.2",- "@deck.gl/geo-layers": "8.1.0-alpha.2",- "@luma.gl/constants": "^8.0.0-beta.4",- "@luma.gl/core": "^8.0.0-beta.4",+ "@deck.gl/extensions": "^8.0.15",+ "@deck.gl/core": "^8.0.15",+ "@deck.gl/layers": "^8.0.15",+ "@deck.gl/aggregation-layers": "^8.0.15",+ "@deck.gl/mesh-layers": "^8.0.15",+ "@deck.gl/react": "^8.0.15",+ "@deck.gl/geo-layers": "^8.0.15",+ "@luma.gl/constants": "^8.0.5",+ "@luma.gl/core": "^8.0.5","@loaders.gl/gltf": "^2.0.0","@mapbox/geo-viewport": "^0.2.2","@mapbox/geojson-normalize": "0.0.1",@@ -173,7 +173,7 @@"@babel/runtime": "^7.0.0","@babel/traverse": "^7.2.3","@deck.gl/test-utils": "^8.0.11",- "@luma.gl/test-utils": "^8.0.0-beta.4",+ "@luma.gl/test-utils": "^8.0.5","@probe.gl/test-utils": "^3.0.1","babel-eslint": "^9.0.0","babel-loader": "^8.0.0",diff --git a/src/layers/layer-text-label.js b/src/layers/layer-text-label.jsindex e0012855f..97b56b370 100644--- a/src/layers/layer-text-label.js+++ b/src/layers/layer-text-label.js@@ -1,4 +1,3 @@-// Copyright (c) 2020 Uber Technologies, Inc.//// Permission is hereby granted, free of charge, to any person obtaining a copy@@ -18,6 +17,7 @@// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.+import {getDistanceScales} from 'viewport-mercator-project';import {notNullorUndefined} from 'utils/data-utils';import uniq from 'lodash.uniq';diff --git a/yarn.lock b/yarn.lockindex baa1f6ee2..f75c6190a 100644--- a/yarn.lock+++ b/yarn.lock@@ -1044,19 +1044,19 @@lodash "^4.17.13"to-fast-properties "^2.0.0"-"@deck.gl/[email protected]":- version "8.1.0-alpha.2"- resolved "https://registry.yarnpkg.com/@deck.gl/aggregation-layers/-/aggregation-layers-8.1.0-alpha.2.tgz#7f080862c9a3d2d3be015d9106623d4383214239"- integrity sha512-UYSy9U2AkQEfrXn2jX0eEY9PVTRtudZGErQUl4GqbkQJmRemaxxxTTCx1OyEFX9V7pgAsAPE+lxWLt0EGjY+rg==+"@deck.gl/aggregation-layers@^8.0.15":+ version "8.0.15"+ resolved "https://registry.yarnpkg.com/@deck.gl/aggregation-layers/-/aggregation-layers-8.0.15.tgz#a21c96a6f51d0a4f814ee79a41cfc3b8873f65d9"+ integrity sha512-QoAR6FWBOzdGnaXV8mqmBHdAtGTMNaMZu/Iv823LcYvlsjcWZzqLqsiWi0O8QshhFaOQTho/2QY0PjJdLPFSvw==dependencies:"@luma.gl/shadertools" "^8.0.3""@math.gl/web-mercator" "^3.1.3"d3-hexbin "^0.2.1"-"@deck.gl/[email protected]":- version "8.1.0-alpha.2"- resolved "https://registry.yarnpkg.com/@deck.gl/core/-/core-8.1.0-alpha.2.tgz#b76f0f0417b6c91c894e98eb0b0967ba06975c7b"- integrity sha512-kKGMNAiQJAbAxNKSi5svfdq/XHn4mvNLO961jMxUW6EP4rPa/zXmUJV8x6Cf2N5Jh7GLUEIlBFjNLkRuuzK0cg==+"@deck.gl/core@^8.0.15":+ version "8.0.15"+ resolved "https://registry.yarnpkg.com/@deck.gl/core/-/core-8.0.15.tgz#f72acc7e5825414ae1869f10b3c4595691e9e233"+ integrity sha512-Ws4Jni1Vg6w99kGy0VzYRwxYwCLj/PRzStkC87W4wsn+XmrQ23sDzjyTAanWpzI3pF8XTSGAIZR5Ferg/1bYrg==dependencies:"@loaders.gl/core" "^2.0.2""@loaders.gl/images" "^2.0.2"@@ -1065,17 +1065,19 @@gl-matrix "^3.0.0"math.gl "^3.1.2"mjolnir.js "^2.3.0"- probe.gl "^3.2.1"+ probe.gl "^3.2.0"-"@deck.gl/[email protected]":- version "8.1.0-alpha.2"- resolved "https://registry.yarnpkg.com/@deck.gl/extensions/-/extensions-8.1.0-alpha.2.tgz#527af38eaf6c54581448f1cc9b2d55bfacc367ce"- integrity sha512-1sEvssIdsFxMMPz+3qMLYZ0QqaDKMZniLMOrvlOeBcmsdBRmoLpqSZzJY9eI5y3AlEWNnNbRm6C9XKtV2VQhcQ==+"@deck.gl/extensions@^8.0.15":+ version "8.0.15"+ resolved "https://registry.yarnpkg.com/@deck.gl/extensions/-/extensions-8.0.15.tgz#cf061ac6a6c25270face89a300818fe2bd53f319"+ integrity sha512-z5UUslGlqz/FsBc7LV33WCrNcqjS5ybpBeMv5KbJnah516/t2b5SwcWsgFju/tgAbXRI8Zs6ZY4H4uJjiCkVcA==+ dependencies:+ "@luma.gl/shadertools" "^8.0.3"-"@deck.gl/[email protected]":- version "8.1.0-alpha.2"- resolved "https://registry.yarnpkg.com/@deck.gl/geo-layers/-/geo-layers-8.1.0-alpha.2.tgz#2be49feefc685a5351a82faa3c4d95bfd1113ccb"- integrity sha512-4FRgLk6t7KBRogs8CctPujud50n0zvt9G4fLmNEQG9Ju8oz2X29SanBPUZtSxoMboCtbuXfF9z4qY5fwS1z5tw==+"@deck.gl/geo-layers@^8.0.15":+ version "8.0.15"+ resolved "https://registry.yarnpkg.com/@deck.gl/geo-layers/-/geo-layers-8.0.15.tgz#6ccf2365011c5b1b38b237ddb45113db814a860b"+ integrity sha512-LvXgWzgQyMu/3r9eXdQIW6I/Jw8RUcJb1ttcSwB2JfuFkazmiSbfDrv8+nTk8kZpX/3V8nFhbYYnOIFhuqo5Lw==dependencies:"@loaders.gl/3d-tiles" "^2.0.2""@math.gl/web-mercator" "^3.1.3"@@ -1083,27 +1085,28 @@long "^3.2.0"s2-geometry "^1.2.10"-"@deck.gl/[email protected]":- version "8.1.0-alpha.2"- resolved "https://registry.yarnpkg.com/@deck.gl/layers/-/layers-8.1.0-alpha.2.tgz#f08a2c0e39dccc12041e82fff19afe5b378239ca"- integrity sha512-ojOLgjXT43W+Mex+2gsW+WLftRf9DOoFRapz1NhAK0/MnbN0N7kJrVbaU2fi7HdgzK9cuwiFalNchK5KsRqEzQ==+"@deck.gl/layers@^8.0.15":+ version "8.0.15"+ resolved "https://registry.yarnpkg.com/@deck.gl/layers/-/layers-8.0.15.tgz#0c07e59d419b031b889f6d69fb7f516a0a98a464"+ integrity sha512-Gq1gSqPAzvdIi6TnNTs8RZl8V2C0nft6BPlkCsRL4H5hz2JelGzXpt7aLUAvAUQZWvXxLOKIoURc18ddmfp82w==dependencies:"@loaders.gl/core" "^2.0.2""@loaders.gl/images" "^2.0.2""@mapbox/tiny-sdf" "^1.1.0"earcut "^2.0.6"-"@deck.gl/[email protected]":- version "8.1.0-alpha.2"- resolved "https://registry.yarnpkg.com/@deck.gl/mesh-layers/-/mesh-layers-8.1.0-alpha.2.tgz#74ca350645cb2522ce8be7b51e868c7251fe84fd"- integrity sha512-88C37RMZKTW+y0qpWAtnLOR6c1I5JHrPdH0nmZLbxaYYzh3w1XhmlfmgnOUMF9U4ph1mnuQoJH+SSc3Qap961Q==+"@deck.gl/mesh-layers@^8.0.15":+ version "8.0.15"+ resolved "https://registry.yarnpkg.com/@deck.gl/mesh-layers/-/mesh-layers-8.0.15.tgz#e861afb40ab6892281850dedadfb522b2b556bd1"+ integrity sha512-3Tpi5ViAk5NFAokoeU073srz/dZIvDy2tldT3i4xgkniNNbt9GbMSS1D98JN2eyyHr4Fo4gukgXiGS0hPwX3XQ==dependencies:"@luma.gl/experimental" "^8.0.3"+ "@luma.gl/shadertools" "^8.0.3"-"@deck.gl/[email protected]":- version "8.1.0-alpha.2"- resolved "https://registry.yarnpkg.com/@deck.gl/react/-/react-8.1.0-alpha.2.tgz#f2640a0cf359a2a969c5253db53a8559f3f71856"- integrity sha512-Q5kuWlBWzAkmWy9KVaUJDden3WTqpe1jKTfffQiNnmOWjoOm30eH4zExq4UwUPyGy0+H59unIBPx0dGJpiVeSQ==+"@deck.gl/react@^8.0.15":+ version "8.0.15"+ resolved "https://registry.yarnpkg.com/@deck.gl/react/-/react-8.0.15.tgz#8d6cb123471ecd3fc4c16baa154913707d2b29fa"+ integrity sha512-GWZIEeVkRZ7wJsqpvNElXGocTvr5XJVrtfW7b/zcs6wNJkUBEUYukjKu0IjCEYeBTM9OUKtr4Cces1NbKSEJog==dependencies:prop-types "^15.6.0"@@ -1944,76 +1947,76 @@"@loaders.gl/images" "2.0.2"math.gl "^3.1.2"-"@luma.gl/[email protected]", "@luma.gl/constants@^8.0.0-beta.4":- version "8.0.3"- resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-8.0.3.tgz#5418bc121f2d2b477e94df1170702f7563ee1b91"- integrity sha512-Ps89hhaNGyseXDECnSNWbDARP3n1WOttoUnci2BL3O6Od7IIzkuV4HeoI3wsH5Zyyf9/3UBFaFwDnfnfK7E0TA==+"@luma.gl/[email protected]", "@luma.gl/constants@^8.0.5":+ version "8.0.5"+ resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-8.0.5.tgz#fcbbc330f341eaf98ccaca57aa396768f1464f9f"+ integrity sha512-wLoY+4kZyAEwICdi/BeatRZTAGezii4srUiNlqmtzwUgQMg1xBUF1+jqCR6rT5zD9FcNTf/8Kr2+rimvKA0/Aw==-"@luma.gl/core@^8.0.0-beta.4", "@luma.gl/core@^8.0.3":- version "8.0.3"- resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-8.0.3.tgz#7befb15991ab89323a450095c2e28ec9099510d0"- integrity sha512-XjsIgBaLku5XxCDFp/cz0Dp3YCYAHgpMrbOPEb4fyE08J1hu7PnarudzpjG0DQsmOjeDZYsf0siAYcwcZXfnJg==+"@luma.gl/core@^8.0.3", "@luma.gl/core@^8.0.5":+ version "8.0.5"+ resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-8.0.5.tgz#8b06cce6c4e7ff9a1996e3b415526c7cd211af04"+ integrity sha512-orX53L8+uFu493vGd8n4b1iMpspxPdidGk3MDdAhi4rcKgYmow7gWfDDW/tthP5aRmYAv8CovrcCuNlW/BEy6Q==dependencies:"@babel/runtime" "^7.0.0"- "@luma.gl/constants" "8.0.3"- "@luma.gl/engine" "8.0.3"- "@luma.gl/shadertools" "8.0.3"- "@luma.gl/webgl" "8.0.3"+ "@luma.gl/constants" "8.0.5"+ "@luma.gl/engine" "8.0.5"+ "@luma.gl/shadertools" "8.0.5"+ "@luma.gl/webgl" "8.0.5"-"@luma.gl/[email protected]":- version "8.0.3"- resolved "https://registry.yarnpkg.com/@luma.gl/engine/-/engine-8.0.3.tgz#3018fe78111d5f4c4eb5dac4fb444c0736f6bd83"- integrity sha512-MdcbQ34cFwF1W14UJ57ONTCfk/yUJ+WsXlW7k1hBbsYvXNZwTMIsa7q/KwdYD0pdhiXwgjLAlwJ0+o+4ra5PlQ==+"@luma.gl/[email protected]":+ version "8.0.5"+ resolved "https://registry.yarnpkg.com/@luma.gl/engine/-/engine-8.0.5.tgz#c004bd4f93db247a40f36f02beef5b4622dc5ad1"+ integrity sha512-jZecURL1SZ5zy/esLp5R1Mg6UDOQceVKAgrVRJafbb2gsn/0b4Kw4lUteHFRroi91qoluMrylDPZbSJqApiMIw==dependencies:"@babel/runtime" "^7.0.0"- "@luma.gl/constants" "8.0.3"- "@luma.gl/gltools" "8.0.3"- "@luma.gl/shadertools" "8.0.3"- "@luma.gl/webgl" "8.0.3"+ "@luma.gl/constants" "8.0.5"+ "@luma.gl/gltools" "8.0.5"+ "@luma.gl/shadertools" "8.0.5"+ "@luma.gl/webgl" "8.0.5"math.gl "^3.1.2"probe.gl "^3.2.0""@luma.gl/experimental@^8.0.3":- version "8.0.3"- resolved "https://registry.yarnpkg.com/@luma.gl/experimental/-/experimental-8.0.3.tgz#ede9364ca0d116428b8571ef2d1600c5e45e3b35"- integrity sha512-aY3ojo07Ds7aHsHFdwQSCrZ5mm++cfO2gjh01REGmZ1MXHP44gq5Kj5sCFzmVzLCAu31sHkL3ri8Y5H8s/sATQ==+ version "8.0.5"+ resolved "https://registry.yarnpkg.com/@luma.gl/experimental/-/experimental-8.0.5.tgz#8155ba147df57d0942543a67ecbfda0ddc3fc45f"+ integrity sha512-9vLgS3yinGMmCHf5xQEtOF9ArPQynUWv2udUX1U4BtKNC3DVKaZcDPsqo3JnFBhNl1cO0Hctr9jDThfTU0rLjQ==dependencies:"@loaders.gl/images" "^2.0.0"- "@luma.gl/constants" "8.0.3"+ "@luma.gl/constants" "8.0.5"math.gl "^3.1.2"-"@luma.gl/[email protected]":- version "8.0.3"- resolved "https://registry.yarnpkg.com/@luma.gl/gltools/-/gltools-8.0.3.tgz#1e02f94c3cb56d8d85e2d98c0ebdd8d25afeb98d"- integrity sha512-SMExUgaVweGkYPRDZVvmOfYsphD5h00/VPQp2/du5idbeiq1H9HtAj5hKAvddtpGTQPwW7GJHof+/FA/MsZpEg==+"@luma.gl/[email protected]":+ version "8.0.5"+ resolved "https://registry.yarnpkg.com/@luma.gl/gltools/-/gltools-8.0.5.tgz#e6cd444a155006e03752b1e369ac7671af19cab1"+ integrity sha512-+qfogtK7oYcLXYWILbf+UxFhWgl293vebf+cvm7KBsNbPYKO8YHgXHO3KjrS3dMl6JmNay+3gUeCrmmtmWIvWg==dependencies:"@babel/runtime" "^7.0.0"- "@luma.gl/constants" "8.0.3"+ "@luma.gl/constants" "8.0.5"probe.gl "^3.2.0"-"@luma.gl/[email protected]", "@luma.gl/shadertools@^8.0.3":- version "8.0.3"- resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-8.0.3.tgz#24af7c3b67095f6d21be7783beda8db339f4b0e3"- integrity sha512-ExV20p1rUgrl7VHlfMdP1thLac7Uj/eBd2x+3KWE0NHJdEy4wJggiXAcDwnFxp5WKfI+UqedFE/zbgLobf/UoA==+"@luma.gl/[email protected]", "@luma.gl/shadertools@^8.0.3":+ version "8.0.5"+ resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-8.0.5.tgz#dae3464a7f200cdd9c1b40aec419e19a9fe7003f"+ integrity sha512-PeIQjruDTRJQ5H3Ykkv/TqZrMtfLR6chKRS8VTQNAD2TKN0TW/6iBYjNeKulq4MDGrgg3CHvOhcgccL9LcHZ2w==dependencies:"@babel/runtime" "^7.0.0"math.gl "^3.1.2"-"@luma.gl/test-utils@^8.0.0-beta.4":- version "8.0.3"- resolved "https://registry.yarnpkg.com/@luma.gl/test-utils/-/test-utils-8.0.3.tgz#f0249f4ac2b3cc283b4a743d9b9bc6f2f7fd958d"- integrity sha512-Enx4jwwbvDGKxHV3Lwgoxe23IdkATuzoQMewXoyv4R8+pIwsVqllfyCAAZZAQoTXVqtbYDXm8dAI63bCcUtGCg==+"@luma.gl/test-utils@^8.0.5":+ version "8.0.5"+ resolved "https://registry.yarnpkg.com/@luma.gl/test-utils/-/test-utils-8.0.5.tgz#bacfb5d63e827bd72b70e4aaa9b62ffea2a33219"+ integrity sha512-Go71vNOwhmk3BPWOiju3Q++Zp7u5P8DPqfIO35eULcmIF7rGPxJJ509cTyvCn17Cb6nAy+FwLa2sJ2U3HSJ9Ow==dependencies:probe.gl "^3.2.0"-"@luma.gl/[email protected]":- version "8.0.3"- resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-8.0.3.tgz#07d9bda90c6c03d61c1bedfee4be89e9741407c2"- integrity sha512-UOGedSTigU2J1ot7MWJETkCeqOcMF7gdDqUjQELnzgcTGSDc5pTerCEq1RLOjabys8fftIwNaiprhViOfif0DA==+"@luma.gl/[email protected]":+ version "8.0.5"+ resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-8.0.5.tgz#ee4e4528b9f9d2f9f4d1f8a6aac81fe42e7058bc"+ integrity sha512-8Ps9TRVqcjFY0qp2vjPHpPKxoa2RSf1jzUMEc0yd+gyf+P6r05r3ZRwvgW7n54IVssg23eYVXCAmiIYWklAw/A==dependencies:"@babel/runtime" "^7.0.0"- "@luma.gl/constants" "8.0.3"- "@luma.gl/gltools" "8.0.3"+ "@luma.gl/constants" "8.0.5"+ "@luma.gl/gltools" "8.0.5"probe.gl "^3.2.0""@mapbox/geo-viewport@^0.2.2":@@ -10670,7 +10673,7 @@ private@^0.1.6:resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==[email protected], probe.gl@^3.2.0, probe.gl@^3.2.1:[email protected], probe.gl@^3.2.0:version "3.2.1"resolved "https://registry.yarnpkg.com/probe.gl/-/probe.gl-3.2.1.tgz#c92db3e89df6c45a9fe0377890c6b0ded35d2974"integrity sha512-ax0flZWVcrw3FF9MMt84mqfIckjkB7ItGer9rr8zlUbkIyzt66ypeJVLQlC28dJ/RBZtriflt2sVAhjENFohQA==