Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bugs in pre-bundled version #3672

Merged
merged 2 commits into from Sep 21, 2019
Merged

Fix bugs in pre-bundled version #3672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a628898
merge experimental exports
Sep 20, 2019
f849334
bump loaders.gl version
Sep 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions modules/aggregation-layers/bundle.js
View file
Open in desktop
Expand Up @@ -8,5 +8,7 @@ const deck = _global.deck || {};
if (!deck.LineLayer) {
throw new Error('@deck.gl/layers is not found');
}
// Merge experimental exports
Object.assign(deckGLLayers.experimental, deck.experimental);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the variable was called aggregationLayers I would have been less confused...

Didn't we drop experimental export in favor of underscores?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We moved classes to underscore but kept utility functions in the experimental object.


module.exports = Object.assign(deck, deckGLLayers);
4 changes: 2 additions & 2 deletions modules/core/package.json
View file
Open in desktop
Expand Up @@ -30,8 +30,8 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@loaders.gl/core": "^1.3.1",
"@loaders.gl/images": "^1.3.1",
"@loaders.gl/core": "^1.3.2",
"@loaders.gl/images": "^1.3.2",
"@luma.gl/addons": "^7.3.0-beta.2",
"@luma.gl/core": "^7.3.0-beta.2",
"gl-matrix": "^3.0.0",
Expand Down
6 changes: 3 additions & 3 deletions modules/geo-layers/package.json
View file
Open in desktop
Expand Up @@ -30,9 +30,9 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@loaders.gl/3d-tiles": "^1.3.1",
"@loaders.gl/core": "^1.3.1",
"@loaders.gl/gltf": "^1.3.1",
"@loaders.gl/3d-tiles": "^1.3.2",
"@loaders.gl/core": "^1.3.2",
"@loaders.gl/gltf": "^1.3.2",
"@math.gl/culling": "^3.0.0",
"@math.gl/geospatial": "^3.0.0",
"h3-js": "^3.4.3",
Expand Down
2 changes: 1 addition & 1 deletion modules/layers/package.json
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@loaders.gl/images": "^1.3.1",
"@loaders.gl/images": "^1.3.2",
"@mapbox/tiny-sdf": "^1.1.0",
"earcut": "^2.0.6"
},
Expand Down
4 changes: 4 additions & 0 deletions modules/main/bundle.js
View file
Open in desktop
@@ -1,4 +1,5 @@
const deck = require('../core/bundle');
const {experimental} = deck;

Object.assign(
deck,
Expand All @@ -12,4 +13,7 @@ Object.assign(
require('@deck.gl/json')
);

// Make sure core exports are preserved
Object.assign(deck.experimental, experimental);

module.exports = deck;
64 changes: 32 additions & 32 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -1487,15 +1487,15 @@
npmlog "^4.1.2"
write-file-atomic "^2.3.0"

"@loaders.gl/3d-tiles@^1.3.1":
version "1.3.1"
resolved "https://registry.yarnpkg.com/@loaders.gl/3d-tiles/-/3d-tiles-1.3.1.tgz#6f82c22e48cf1940c5b3e2729a858c7d4935f3c2"
integrity sha512-PyQ1pzUmEV/FS1L3l8ewHnb5eFCqsU+XIGczyiuky+rR/t6qfwGEG8cTqux8VThClNQ26MYeHDq/jDxahnvzZg==
"@loaders.gl/3d-tiles@^1.3.2":
version "1.3.2"
resolved "https://registry.yarnpkg.com/@loaders.gl/3d-tiles/-/3d-tiles-1.3.2.tgz#b02d7c0a4cde55324bec2b403fdffa8df546af75"
integrity sha512-4xezNtjB4M4df7PLI4jlFcR8On89WoV2mfIS95ReTtVmPPUX4Cxu5iVc8QIcyMSGfOfZch5mkqSw1Z+XzPLwFw==
dependencies:
"@loaders.gl/core" "1.3.1"
"@loaders.gl/gltf" "1.3.1"
"@loaders.gl/loader-utils" "1.3.1"
"@loaders.gl/math" "1.3.1"
"@loaders.gl/core" "1.3.2"
"@loaders.gl/gltf" "1.3.2"
"@loaders.gl/loader-utils" "1.3.2"
"@loaders.gl/math" "1.3.2"
"@math.gl/culling" "^3.0.0-beta.3"
"@math.gl/geospatial" "^3.0.0-beta.3"
math.gl "^3.0.0-beta.3"
Expand All @@ -1508,21 +1508,21 @@
dependencies:
"@babel/runtime" "^7.3.1"

"@loaders.gl/core@1.3.1", "@loaders.gl/core@^1.3.1":
version "1.3.1"
resolved "https://registry.yarnpkg.com/@loaders.gl/core/-/core-1.3.1.tgz#9d9f73dee8fb887c6975a399efe9cd399f3b0a4b"
integrity sha512-ox4OoFRhBCVlCwCRygkeNFToNNKOqlXNf7FUJTRd5Y918MKv5NQnCT/6VsNSRuRx4xlDiOAl5ne9QhGQvc017Q==
"@loaders.gl/core@1.3.2", "@loaders.gl/core@^1.3.2":
version "1.3.2"
resolved "https://registry.yarnpkg.com/@loaders.gl/core/-/core-1.3.2.tgz#21d4b2c7bc5e83b396cc2324060d81d64b4ba009"
integrity sha512-as14DhYAE2UQDjPO1GcSesjHq6iPjmUIfbz+3Azs9jcpxq5wBCBqu1d+sNB5E8i9o9j/CLDLp2HLuYbY9Yc0fA==
dependencies:
"@babel/runtime" "^7.3.1"

"@loaders.gl/gltf@1.3.1", "@loaders.gl/gltf@^1.3.1":
version "1.3.1"
resolved "https://registry.yarnpkg.com/@loaders.gl/gltf/-/gltf-1.3.1.tgz#31caa2ba130dac731d3c040ac4107ec4677f2883"
integrity sha512-+am05H+coaQl3ZWLT4QLHxBpKID7kVTRLNnMLFluoT6eYJS1dVXPg8bq2bwiY0opa/CAK1znssSnegnG85G8MA==
"@loaders.gl/gltf@1.3.2", "@loaders.gl/gltf@^1.3.2":
version "1.3.2"
resolved "https://registry.yarnpkg.com/@loaders.gl/gltf/-/gltf-1.3.2.tgz#6d189acf7081657ca9031c7c5649f3de5d58c98f"
integrity sha512-cyV7h/rWiLhpqlrFUGq1nDeya2lMoROdKN/73mMyWoAWwWOCKNFMvAqfuaTpOCH6wBhaRC2+6CNnqBq+FauYFQ==
dependencies:
"@loaders.gl/core" "1.3.1"
"@loaders.gl/images" "1.3.1"
"@loaders.gl/loader-utils" "1.3.1"
"@loaders.gl/core" "1.3.2"
"@loaders.gl/images" "1.3.2"
"@loaders.gl/loader-utils" "1.3.2"

"@loaders.gl/gltf@^1.3.0":
version "1.3.0"
Expand All @@ -1538,10 +1538,10 @@
resolved "https://registry.yarnpkg.com/@loaders.gl/images/-/images-1.3.0.tgz#68ded62210c3fef11ddf5b59fe9a66dd4fa1bf1b"
integrity sha512-08aD9Q3i3pYgcrZxXgNdkKpUzY33qmrhfuRrzhi+BpHjzkEl27FoYz1wE3UTUPwqKP9ivB8cjyPrgcjrIHV+Yg==

"@loaders.gl/images@1.3.1", "@loaders.gl/images@^1.3.1":
version "1.3.1"
resolved "https://registry.yarnpkg.com/@loaders.gl/images/-/images-1.3.1.tgz#eb7734321e568e1fecc7c1b32fcca8fa5e3d7196"
integrity sha512-nDkbXIy34D4WYnxhOl7yGCF04JQuKP8+ZC6rKSBDoNtQW+hGpCHNVQMJ6dZxUr1HA/2wCV6tU8JSiwz6Jp+yhQ==
"@loaders.gl/images@1.3.2", "@loaders.gl/images@^1.3.2":
version "1.3.2"
resolved "https://registry.yarnpkg.com/@loaders.gl/images/-/images-1.3.2.tgz#fc2ca2c9fa90dc3c5dd1b2db82dd006823111ea2"
integrity sha512-8w0AT8hfwuZtMAJfwLqgrq5cMzZvWJjLsk06Z1rE1MywlHSJQx/fG7kMtFlVYfT39dcugoVmPpVH8SRLgN9rQw==

"@loaders.gl/loader-utils@1.3.0":
version "1.3.0"
Expand All @@ -1550,19 +1550,19 @@
dependencies:
"@babel/runtime" "^7.3.1"

"@loaders.gl/loader-utils@1.3.1":
version "1.3.1"
resolved "https://registry.yarnpkg.com/@loaders.gl/loader-utils/-/loader-utils-1.3.1.tgz#14cdd34ae5e1c2ac583f1890fc57e56547cccb58"
integrity sha512-o/VusIwu/awpoY6zwypAlOxa3LW/QQHncZywCwQdi21JjP83F4EsXJYy2YVha1szeOTPotqQgnQhsDzwCEqDyA==
"@loaders.gl/loader-utils@1.3.2":
version "1.3.2"
resolved "https://registry.yarnpkg.com/@loaders.gl/loader-utils/-/loader-utils-1.3.2.tgz#158a779924ece2943e53ed33432fd5ed87678951"
integrity sha512-aYhdl3+jHhYcODzLWEGtHqnXoFy82qUDliniOtRJ56mvIoZ8l32JV4KJkgag2+2Il8Tm+UD80IEYFGugQg8TYw==
dependencies:
"@babel/runtime" "^7.3.1"

"@loaders.gl/math@1.3.1":
version "1.3.1"
resolved "https://registry.yarnpkg.com/@loaders.gl/math/-/math-1.3.1.tgz#4b06f8872cbf31f5a02c25a14c60719a9956dcee"
integrity sha512-ll6Hy46jQs1lBR4oyMUFdzgsZriTTh/+KX4RGvTmD4nok5BlcIgKNDowdKPzVeNh1v3A5G5KfBvV5RipgkAqog==
"@loaders.gl/math@1.3.2":
version "1.3.2"
resolved "https://registry.yarnpkg.com/@loaders.gl/math/-/math-1.3.2.tgz#65785a2962ad9288a9ef44c1af8889261d6960d7"
integrity sha512-0NYvyWZ1dFJjhOE0XX74yqrTNod6VR7qeTYrJMOrtquHS/cvzrRV9yI584l85z+4FJu4Py+cHQWaMUZNPZ9Tvw==
dependencies:
"@loaders.gl/images" "1.3.1"
"@loaders.gl/images" "1.3.2"
math.gl "^3.0.0-beta.3"

"@loaders.gl/polyfills@1.3.0":
Expand Down