Skip to content
Permalink
Browse files

Merge 58daa26 into 67eeaae

  • Loading branch information
Pessimistress committed Sep 18, 2019
2 parents 67eeaae + 58daa26 commit 82a901979cdaedad2476b023ecca7727d93e94c4
Showing with 103 additions and 78 deletions.
  1. +4 −4 modules/core/package.json
  2. +2 −2 modules/geo-layers/package.json
  3. +1 −1 modules/mesh-layers/package.json
  4. +1 −1 modules/test-utils/package.json
  5. +3 −3 package.json
  6. +92 −67 yarn.lock
@@ -32,12 +32,12 @@
"dependencies": {
"@loaders.gl/core": "^1.3.0",
"@loaders.gl/images": "^1.3.0",
"@luma.gl/addons": "^7.3.0-alpha.9",
"@luma.gl/core": "^7.3.0-alpha.9",
"@luma.gl/addons": "^7.3.0-beta.2",
"@luma.gl/core": "^7.3.0-beta.2",
"gl-matrix": "^3.0.0",
"math.gl": "^3.0.0-beta.3",
"math.gl": "^3.0.0",
"mjolnir.js": "^2.1.2",
"probe.gl": "^3.1.0-beta.3",
"probe.gl": "^3.1.0",
"seer": "^0.2.4",
"viewport-mercator-project": "^6.1.0"
}
@@ -33,8 +33,8 @@
"@loaders.gl/3d-tiles": "^1.3.0",
"@loaders.gl/core": "^1.3.0",
"@loaders.gl/gltf": "^1.3.0",
"@math.gl/culling": "^3.0.0-beta.3",
"@math.gl/geospatial": "^3.0.0-beta.3",
"@math.gl/culling": "^3.0.0",
"@math.gl/geospatial": "^3.0.0",
"h3-js": "^3.4.3",
"long": "^3.2.0",
"s2-geometry": "^1.2.10"
@@ -33,6 +33,6 @@
"@deck.gl/core": "^7.0.0"
},
"dependencies": {
"@luma.gl/addons": "^7.3.0-alpha.9"
"@luma.gl/addons": "^7.3.0-beta.2"
}
}
@@ -25,7 +25,7 @@
],
"peerDependencies": {
"@deck.gl/core": "^7.0.0",
"@probe.gl/test-utils": "^3.1.0-beta.3"
"@probe.gl/test-utils": "^3.1.0"
},
"scripts": {}
}
@@ -41,9 +41,9 @@
"jsdom": false
},
"devDependencies": {
"@luma.gl/effects": "^7.3.0-alpha.8",
"@probe.gl/bench": "^3.1.0-beta.3",
"@probe.gl/test-utils": "^3.1.0-beta.3",
"@luma.gl/effects": "^7.3.0-beta.2",
"@probe.gl/bench": "^3.1.0",
"@probe.gl/test-utils": "^3.1.0",
"@loaders.gl/polyfills": "1.3.0",
"babel-loader": "^8.0.0",
"babel-plugin-inline-webgl-constants": "^1.0.1",
159 yarn.lock
@@ -1548,82 +1548,82 @@
stream-to-async-iterator "^0.2.0"
through "^2.3.8"

"@luma.gl/addons@^7.3.0-alpha.9":
version "7.3.0-alpha.9"
resolved "https://registry.yarnpkg.com/@luma.gl/addons/-/addons-7.3.0-alpha.9.tgz#f4accbb04bdb69d5c9698d82137196fe0c795ee7"
integrity sha512-onsfmjx/1cpd55hW//Aul6dmN3Y92pZCZhvLLLFx4yxrSPOidpqU/+2JVVsY2cAJpY60IXViDhvmVI7F8Nj7Bg==
"@luma.gl/addons@^7.3.0-beta.2":
version "7.3.0-beta.2"
resolved "https://registry.yarnpkg.com/@luma.gl/addons/-/addons-7.3.0-beta.2.tgz#2967595a15f6132168dd698d7d1ef8d4ceca59a0"
integrity sha512-5VTSBPIATSfBmPFliL6SUu2ndFnULJh5JPD6CvxF/Av4WYksoEJXjBdjUM0B2AxfH8X4zjJNW8KpKK/PXfyhuA==
dependencies:
"@loaders.gl/gltf" "^1.3.0"
"@loaders.gl/images" "^1.3.0"
"@luma.gl/constants" "7.3.0-alpha.9"
"@luma.gl/constants" "7.3.0-beta.2"
math.gl "^3.0.0"

"@luma.gl/constants@7.3.0-alpha.8", "@luma.gl/constants@^7.3.0-alpha.1":
"@luma.gl/constants@7.3.0-beta.2":
version "7.3.0-beta.2"
resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-7.3.0-beta.2.tgz#9dfca7f8563607560ce90cb8ff5e921862d5c331"
integrity sha512-D9eydPR+45qW0P9VkZHehXMEOJwpA6W6zmPiFuDvfTDNsNJGRd8vzrz8/AVwESTQszNPRWQQEthTgX8LaOt4aQ==

"@luma.gl/constants@^7.3.0-alpha.1":
version "7.3.0-alpha.8"
resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-7.3.0-alpha.8.tgz#900dd18a157e9c9a0886aba6f79fae80006c2bc4"
integrity sha512-MjEBfWCqYrYREMHh+XQneJlYDK+Z5Uh7cvodUhugaWRKoVbQI884ISAt4+6tWJj5DXQC/k8V1ypa+Hd3hY+oBw==

"@luma.gl/constants@7.3.0-alpha.9":
version "7.3.0-alpha.9"
resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-7.3.0-alpha.9.tgz#e67ae6fd99f938896d9bcff46c57659c1e3d5e9b"
integrity sha512-O2NttVLSB5JaXCBLNXdNqlC+AYl7NVKIIUP6+J7UpQVLICEdFPdiY4J8vjokwgGblJpXoKTQt3oj2eWVQUTsXQ==

"@luma.gl/core@^7.3.0-alpha.9":
version "7.3.0-alpha.9"
resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-7.3.0-alpha.9.tgz#17e7e297cf7d42cd35b172e70d2eac31b01bf490"
integrity sha512-UcnDM7TgDrfc1zJE0Pk1G5aWzFdXaGS6URsHDGPIkZjZGyMmrOqnbnwt9iJeZsjQqPTwjPhwfHN5uCk5Y5D/2Q==
"@luma.gl/core@^7.3.0-beta.2":
version "7.3.0-beta.2"
resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-7.3.0-beta.2.tgz#7308212b90fa0b7aeffee1cfc6b56f2fb779998c"
integrity sha512-FJY8DKs8pfB8ZmJHWgHH3+PqKDEy7poxrFhi2280Q0pVG+F7haBMjQAFkM5+Ljr2Bb8fXRq/191eEMSpS0g1zQ==
dependencies:
"@babel/runtime" "^7.0.0"
"@luma.gl/constants" "7.3.0-alpha.9"
"@luma.gl/shadertools" "7.3.0-alpha.9"
"@luma.gl/webgl" "7.3.0-alpha.9"
"@luma.gl/webgl-state-tracker" "7.3.0-alpha.9"
"@luma.gl/webgl2-polyfill" "7.3.0-alpha.9"
"@luma.gl/constants" "7.3.0-beta.2"
"@luma.gl/shadertools" "7.3.0-beta.2"
"@luma.gl/webgl" "7.3.0-beta.2"
"@luma.gl/webgl-state-tracker" "7.3.0-beta.2"
"@luma.gl/webgl2-polyfill" "7.3.0-beta.2"
math.gl "^3.0.0"
probe.gl "^3.1.0-beta.3"
probe.gl "^3.1.0"
seer "^0.2.4"

"@luma.gl/effects@^7.3.0-alpha.8":
version "7.3.0-alpha.8"
resolved "https://registry.yarnpkg.com/@luma.gl/effects/-/effects-7.3.0-alpha.8.tgz#7606354271867d2a4530e87ddadc67f836cfcbc8"
integrity sha512-bU0HXfhlCMjUM4FAnjFjzoQZQQMK1qJ3T8q1LKWEFLp+FujLQ6L6v9Bk62hscjjmql1PJbAFpoK/2pt0ayvlvQ==
"@luma.gl/effects@^7.3.0-beta.2":
version "7.3.0-beta.2"
resolved "https://registry.yarnpkg.com/@luma.gl/effects/-/effects-7.3.0-beta.2.tgz#739c3ddacc1c37735e680f188575beb5944d1417"
integrity sha512-Ya8bJ5RT9zU5ZyHBqmPDg+QD9ye/qHHfLKzTTF0h4lnp0iu/oLqsh5oPZ/rqf/QRF/hdz+o9TG8Kmcd2WvFgOg==
dependencies:
"@luma.gl/constants" "7.3.0-alpha.8"
"@luma.gl/constants" "7.3.0-beta.2"

"@luma.gl/shadertools@7.3.0-alpha.9":
version "7.3.0-alpha.9"
resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-7.3.0-alpha.9.tgz#18311fa0257b6e034a47776e6580fc06ad9e4fae"
integrity sha512-Wp1QMpVea9Lq92w5wwMtqbCG09zd9PeM6d+OIL5grmx6Dp1ltSGuAuPjmrNgelmN03q810gpeSTXsddwCMY6LA==
"@luma.gl/shadertools@7.3.0-beta.2":
version "7.3.0-beta.2"
resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-7.3.0-beta.2.tgz#29c6190b151bc1c82cf6a170524c2007bc84d942"
integrity sha512-Eny0KRUPY9jDjU7478lYxEj91hW1RIYyUFIv/6F1tSOTcsTzf2I8GQD2reobrcwENiZ9L1wV7OWY72bfXd2zNw==
dependencies:
"@babel/runtime" "^7.0.0"
math.gl "^3.0.0"

"@luma.gl/webgl-state-tracker@7.3.0-alpha.9":
version "7.3.0-alpha.9"
resolved "https://registry.yarnpkg.com/@luma.gl/webgl-state-tracker/-/webgl-state-tracker-7.3.0-alpha.9.tgz#7e696bcbcd9aa4b3fcb5cdfc7d30b557c917ae71"
integrity sha512-Dv5tI4j1ZmZeZArR9hS/Ca97ZiKete3PSQ2zKnjXfvpwtC8q6ZY5Vrj+PpaIFtwhjXgQwnrpYPErwvILLkVbBw==
"@luma.gl/webgl-state-tracker@7.3.0-beta.2":
version "7.3.0-beta.2"
resolved "https://registry.yarnpkg.com/@luma.gl/webgl-state-tracker/-/webgl-state-tracker-7.3.0-beta.2.tgz#a2692634e8003aeafec7872c39ba7f6376a709c8"
integrity sha512-/hF6kI/NxMY43CQDYqcGeWY8byhj2vjAl38lE16KNi6Cc71z/ron73EVqUMqBHqHc/SCJCyadqlMH6dEY5AeGg==
dependencies:
"@babel/runtime" "^7.0.0"
"@luma.gl/constants" "7.3.0-alpha.9"
"@luma.gl/constants" "7.3.0-beta.2"

"@luma.gl/webgl2-polyfill@7.3.0-alpha.9":
version "7.3.0-alpha.9"
resolved "https://registry.yarnpkg.com/@luma.gl/webgl2-polyfill/-/webgl2-polyfill-7.3.0-alpha.9.tgz#48c6e2ebe055d0087c129198426a7910403cf221"
integrity sha512-TsRVGSrlScCwjGqUdagkpbsE6heiKNwuJgdAZoHTLsNDmmZp2G9901MqXWi558p3Np+zQ+ktLkiAjc/jeOTrfQ==
"@luma.gl/webgl2-polyfill@7.3.0-beta.2":
version "7.3.0-beta.2"
resolved "https://registry.yarnpkg.com/@luma.gl/webgl2-polyfill/-/webgl2-polyfill-7.3.0-beta.2.tgz#625046b71fe0bfd29fa9d48441a58d78484da74d"
integrity sha512-hbc09dnnG3OTUvrZ2K1spyzQ9t/v9SEkMbJVugc2azrzVk149VKQ62k3R60PEop/5lcQYW1ie4IHYIelHteoLQ==
dependencies:
"@babel/runtime" "^7.0.0"
"@luma.gl/constants" "7.3.0-alpha.9"
"@luma.gl/constants" "7.3.0-beta.2"

"@luma.gl/webgl@7.3.0-alpha.9":
version "7.3.0-alpha.9"
resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-7.3.0-alpha.9.tgz#411efde6f97981eaef4af40ed15fe633ab786496"
integrity sha512-xhBFBZStH+LRFRagTcBhp+oRXt57p2oERwdsKME2X/JEBxg2v69KCITs0eKWZSCyDFzkQxnQjfo+e0Qje8zfZA==
"@luma.gl/webgl@7.3.0-beta.2":
version "7.3.0-beta.2"
resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-7.3.0-beta.2.tgz#4a4e1d4d677f166857ba8b970789fa737075c12f"
integrity sha512-HX/F7+tPJKx39HbxcmhGiQ4PiyNmBezyj7XxBq8oeb5Mu+jhWZJ2qCcs1As2UWsNzC68ZUf0/A8rWCoO4z0y3g==
dependencies:
"@babel/runtime" "^7.0.0"
"@luma.gl/constants" "7.3.0-alpha.9"
"@luma.gl/webgl-state-tracker" "7.3.0-alpha.9"
"@luma.gl/webgl2-polyfill" "7.3.0-alpha.9"
probe.gl "^3.1.0-beta.3"
"@luma.gl/constants" "7.3.0-beta.2"
"@luma.gl/webgl-state-tracker" "7.3.0-beta.2"
"@luma.gl/webgl2-polyfill" "7.3.0-beta.2"
probe.gl "^3.1.0"

"@mapbox/geojson-area@0.2.2":
version "0.2.2"
@@ -1684,6 +1684,15 @@
resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe"
integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==

"@math.gl/culling@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@math.gl/culling/-/culling-3.0.0.tgz#6ffb0b73cf4490568fe0961e8e902ea49d12447b"
integrity sha512-g6l1We35RAisn+MDdvcukycyxsuNrYfzhElx7Xy4OObIiNlqRaPZvO4cZR++aabx5PN8xEIDs95HL59V+Vw6jQ==
dependencies:
"@babel/runtime" "^7.0.0"
gl-matrix "^3.0.0"
math.gl "3.0.0"

"@math.gl/culling@^3.0.0-beta.3":
version "3.0.0-beta.3"
resolved "https://registry.yarnpkg.com/@math.gl/culling/-/culling-3.0.0-beta.3.tgz#eaa13e675fddabe5159ea794d58794a93cbd3f08"
@@ -1693,6 +1702,15 @@
gl-matrix "^3.0.0"
math.gl "3.0.0-beta.3"

"@math.gl/geospatial@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@math.gl/geospatial/-/geospatial-3.0.0.tgz#92708a4f6136d95d33d317bd255af055304f177d"
integrity sha512-YeBdCRxe+Ql/C7RtxvCBtHYqz/423xarZxNqFIIzGNQFyQP8z9ETU+tewT7WL10XcZsjtqZToXoygzG0GUXzzw==
dependencies:
"@babel/runtime" "^7.0.0"
gl-matrix "^3.0.0"
math.gl "3.0.0"

"@math.gl/geospatial@^3.0.0-beta.3":
version "3.0.0-beta.3"
resolved "https://registry.yarnpkg.com/@math.gl/geospatial/-/geospatial-3.0.0-beta.3.tgz#3ec7b5d938ea20dacd08619f6a06d73db462b396"
@@ -1866,22 +1884,22 @@
"@phosphor/signaling" "^1.3.0"
"@phosphor/virtualdom" "^1.2.0"

"@probe.gl/bench@^3.1.0-beta.3":
version "3.1.0-beta.3"
resolved "https://registry.yarnpkg.com/@probe.gl/bench/-/bench-3.1.0-beta.3.tgz#27ff3cd84754e05341472370bd0574bc113a9459"
integrity sha512-Z8lIkcKRGuU1i3oInIEwfgCUmhux7vTxp+q2Wrw8cv0ayRv1P3QNKfOG+gO4c581uSi9VHlnRwlFAjS/Z53ZqA==
"@probe.gl/bench@^3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@probe.gl/bench/-/bench-3.1.0.tgz#30aa5de961e4b50023642671389cdea3c71c53ee"
integrity sha512-X57uX3xCrUm66+kDOsCEsRJGpNBrrHqB10VzXM3xtmArM54AG/NAaIdUQmiBVhm/sKIK0DuoqcNI51OSniQf5Q==
dependencies:
"@babel/runtime" "^7.0.0"
probe.gl "3.1.0-beta.3"
probe.gl "3.1.0"

"@probe.gl/test-utils@^3.1.0-beta.3":
version "3.1.0-beta.3"
resolved "https://registry.yarnpkg.com/@probe.gl/test-utils/-/test-utils-3.1.0-beta.3.tgz#5c21e363c0619572bd1807412972be59d1d04b7e"
integrity sha512-5Z9WHFWCEH4AsaEqLKy3Xc7pCEe1C9b5I3qwSavspmJ729DmBlqCjuw5F6xk5lMt44FAwoe4fg7V6MuYPrStxQ==
"@probe.gl/test-utils@^3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@probe.gl/test-utils/-/test-utils-3.1.0.tgz#839ebb4802bcbe23e80523f3d9fd783af02b1b09"
integrity sha512-kxtnHnnno7U/CED2FhQEpwq/8aEEJL93UrtBpu7GQ7ICi1DIBOQaHlMLkeFeRxo0qAuV0X1Bi1tgkJh5h2FGRw==
dependencies:
"@babel/runtime" "^7.0.0"
pixelmatch "^4.0.2"
probe.gl "3.1.0-beta.3"
probe.gl "3.1.0"
puppeteer "^1.16.0"

"@types/backbone@^1.3.33":
@@ -6866,18 +6884,18 @@ mapbox-gl@~0.54.0:
tinyqueue "^2.0.0"
vt-pbf "^3.1.1"

math.gl@3.0.0-beta.3, math.gl@^3.0.0-beta.3:
version "3.0.0-beta.3"
resolved "https://registry.yarnpkg.com/math.gl/-/math.gl-3.0.0-beta.3.tgz#1a853a343f2ae94ed78e6bcdbe9ca49409d6fbf2"
integrity sha512-nFq3A/V3wS8XfVHoGEmW4HXRhVcMS3sbndPu4rUuMWFPWtbZw3NYe8WILPGU999V+bZ1U0/21LeBjaPF8sf0nA==
math.gl@3.0.0, math.gl@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/math.gl/-/math.gl-3.0.0.tgz#fe7ee98bd9439a29942246b3fe7a36f27fba06b2"
integrity sha512-HIH2zXZmkCLudLUQjZe8ppnM5bMBeo8prblFSVQ0jy9AxPa3HZqYONDX6vPOf3En7nwkJzw451JHSYAxe70nPA==
dependencies:
"@babel/runtime" "^7.0.0"
gl-matrix "^3.0.0"

math.gl@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/math.gl/-/math.gl-3.0.0.tgz#fe7ee98bd9439a29942246b3fe7a36f27fba06b2"
integrity sha512-HIH2zXZmkCLudLUQjZe8ppnM5bMBeo8prblFSVQ0jy9AxPa3HZqYONDX6vPOf3En7nwkJzw451JHSYAxe70nPA==
math.gl@3.0.0-beta.3, math.gl@^3.0.0-beta.3:
version "3.0.0-beta.3"
resolved "https://registry.yarnpkg.com/math.gl/-/math.gl-3.0.0-beta.3.tgz#1a853a343f2ae94ed78e6bcdbe9ca49409d6fbf2"
integrity sha512-nFq3A/V3wS8XfVHoGEmW4HXRhVcMS3sbndPu4rUuMWFPWtbZw3NYe8WILPGU999V+bZ1U0/21LeBjaPF8sf0nA==
dependencies:
"@babel/runtime" "^7.0.0"
gl-matrix "^3.0.0"
@@ -8364,7 +8382,14 @@ private@^0.1.6:
resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==

probe.gl@3.1.0-beta.3, probe.gl@^3.1.0-beta.3:
probe.gl@3.1.0, probe.gl@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/probe.gl/-/probe.gl-3.1.0.tgz#6aaeeb2d5bff85458fb7e8f7a72a57a53757c745"
integrity sha512-Bqk+hMklRtHJ29UcDvhjh0ha0JLoZI5wpPBZdzAOwciBGhPXNy1C/TD1ihKBdOlCzTw78EKVLm0eKLj5Xek5+w==
dependencies:
"@babel/runtime" "^7.0.0"

probe.gl@^3.1.0-beta.3:
version "3.1.0-beta.3"
resolved "https://registry.yarnpkg.com/probe.gl/-/probe.gl-3.1.0-beta.3.tgz#41e2713dab8d8885b58cac0bbb7fc237b524788b"
integrity sha512-l0FTMNeuIGG3fngOGRj6q5gyiO9KO/N6wneJhFyRTHKxiCYuUy+vPtFdzCa8tDLOhguwGp4W9Lef9QWRHeuAIw==

0 comments on commit 82a9019

Please sign in to comment.
You can’t perform that action at this time.