From 6af35db4502053deb25fc549c3d70b3b8b8c9575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Arag=C3=B3n?= Date: Wed, 20 Apr 2022 18:14:34 +0200 Subject: [PATCH] Deck Gl as peer dependency (#16413) --- package-lock.json | 129 ++-------------------------------------------- package.json | 20 +++---- vue.config.js | 1 + 3 files changed, 17 insertions(+), 133 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3dde1fd739..64202fefdd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.274-10", + "version": "1.0.0-assets.274-11", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1493,99 +1493,6 @@ "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-10.1.0.tgz", "integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==" }, - "@deck.gl/aggregation-layers": { - "version": "8.7.5", - "resolved": "https://registry.npmjs.org/@deck.gl/aggregation-layers/-/aggregation-layers-8.7.5.tgz", - "integrity": "sha512-DZ3thV3+zZhBWaBRLYG1cd8toIkQq3MiSMgLDPGjH8bGf7LGIMmHri/QyaCEiICjKrUPvP3tToODkQS3eyzAVQ==", - "requires": { - "@luma.gl/shadertools": "^8.5.10", - "@math.gl/web-mercator": "^3.5.7", - "d3-hexbin": "^0.2.1" - } - }, - "@deck.gl/carto": { - "version": "8.7.5", - "resolved": "https://registry.npmjs.org/@deck.gl/carto/-/carto-8.7.5.tgz", - "integrity": "sha512-EFmO3UKkQr9MM2FRWNYvX3PIRO+LqPl7BSr/+BAouf6jhYT79l2Tl0O/DdRl4w5jdX+xG8IFFKe90JTpjK7LHg==", - "requires": { - "@loaders.gl/gis": "^3.1.5", - "@loaders.gl/loader-utils": "^3.1.5", - "@loaders.gl/mvt": "^3.1.5", - "@loaders.gl/tiles": "^3.1.5", - "@luma.gl/constants": "^8.5.10", - "@math.gl/web-mercator": "^3.5.7", - "cartocolor": "^4.0.2", - "d3-array": "^2.8.0", - "d3-color": "^2.0.0", - "d3-format": "^2.0.0", - "d3-scale": "^3.2.3", - "moment-timezone": "^0.5.33", - "pbf": "^3.2.1" - }, - "dependencies": { - "d3-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz", - "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==" - }, - "d3-format": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz", - "integrity": "sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==" - } - } - }, - "@deck.gl/core": { - "version": "8.7.5", - "resolved": "https://registry.npmjs.org/@deck.gl/core/-/core-8.7.5.tgz", - "integrity": "sha512-6VbbgY7Bzt+bsBp/fZvQIM/+48tv4TeByra6nLVsJiYg6iT7O1DlhG5dPVPksZnGXiMADn/cG/iQbbPe/v1UzA==", - "requires": { - "@loaders.gl/core": "^3.1.5", - "@loaders.gl/images": "^3.1.5", - "@luma.gl/constants": "^8.5.10", - "@luma.gl/core": "^8.5.10", - "@math.gl/core": "^3.5.7", - "@math.gl/web-mercator": "^3.5.7", - "@probe.gl/env": "^3.5.0", - "@probe.gl/log": "^3.5.0", - "@probe.gl/stats": "^3.5.0", - "gl-matrix": "^3.0.0", - "math.gl": "^3.5.7", - "mjolnir.js": "^2.5.0" - } - }, - "@deck.gl/extensions": { - "version": "8.7.5", - "resolved": "https://registry.npmjs.org/@deck.gl/extensions/-/extensions-8.7.5.tgz", - "integrity": "sha512-ALUUYuEOYDpW12H0Vx0tdXHKde6iQwnKULwKI33W8Xb65TMS4tbvAwQGmzNdohlwqtdG+4c3wwDqV+nJLIEbnA==", - "requires": { - "@luma.gl/shadertools": "^8.5.10" - } - }, - "@deck.gl/geo-layers": { - "version": "8.7.5", - "resolved": "https://registry.npmjs.org/@deck.gl/geo-layers/-/geo-layers-8.7.5.tgz", - "integrity": "sha512-TK/fLRyEevk5xMF5l/tVJFSn4uoOpIa9gvQxmJSZCVZn4Kt865BEEVKNqeHq8h1tWKr/caO8EAGvhPSBLXz+/g==", - "requires": { - "@loaders.gl/3d-tiles": "^3.1.5", - "@loaders.gl/gis": "^3.1.5", - "@loaders.gl/loader-utils": "^3.1.5", - "@loaders.gl/mvt": "^3.1.5", - "@loaders.gl/terrain": "^3.1.5", - "@loaders.gl/tiles": "^3.1.5", - "@luma.gl/experimental": "^8.5.10", - "@math.gl/core": "^3.5.7", - "@math.gl/culling": "^3.5.7", - "@math.gl/web-mercator": "^3.5.7", - "h3-js": "^3.6.0", - "long": "^3.2.0" - } - }, - "@deck.gl/google-maps": { - "version": "8.7.5", - "resolved": "https://registry.npmjs.org/@deck.gl/google-maps/-/google-maps-8.7.5.tgz", - "integrity": "sha512-ICsD9I3TWRXE/vq5TAMiPvaR9fPLTv+hU+U7VskXh83wP1R8myFvESBGm9wm/ASa+UH+Pe6/RhsAuUX4MsI3qQ==" - }, "@deck.gl/json": { "version": "8.5.6", "resolved": "https://registry.npmjs.org/@deck.gl/json/-/json-8.5.6.tgz", @@ -1595,34 +1502,11 @@ "expression-eval": "^2.0.0" } }, - "@deck.gl/layers": { - "version": "8.7.5", - "resolved": "https://registry.npmjs.org/@deck.gl/layers/-/layers-8.7.5.tgz", - "integrity": "sha512-7DExC6mzIsxwvJRR0CFBfE+b5N98163U3+vCuBRCrmGEIvAohcijiDFRiDPA1eN6WussYVF3e3AxmNElvMC+Iw==", - "requires": { - "@loaders.gl/images": "^3.1.5", - "@mapbox/tiny-sdf": "^1.1.0", - "@math.gl/polygon": "^3.5.7", - "earcut": "^2.0.6" - } - }, "@deck.gl/mapbox": { "version": "8.5.6", "resolved": "https://registry.npmjs.org/@deck.gl/mapbox/-/mapbox-8.5.6.tgz", "integrity": "sha512-C+QfWQP+LZPD7DVVutoGEi2BAipZfyEneLOxWzYousjOtFLtHjCt/Sd+33VtNqvquCIQTmsHQZ/a8Xp4eUBKkg==" }, - "@deck.gl/mesh-layers": { - "version": "8.7.5", - "resolved": "https://registry.npmjs.org/@deck.gl/mesh-layers/-/mesh-layers-8.7.5.tgz", - "integrity": "sha512-aPeU5bQvQkM6WiFjyRpVbwu4ghX9wtvxYVKtPszritQDo+oRhmxzEThZshqvOxpbfmx11VU8E559PrJwXuCo9g==", - "requires": { - "@loaders.gl/gltf": "^3.1.5", - "@luma.gl/constants": "^8.5.10", - "@luma.gl/core": "^8.5.10", - "@luma.gl/experimental": "^8.5.10", - "@luma.gl/shadertools": "^8.5.10" - } - }, "@deck.gl/react": { "version": "8.5.6", "resolved": "https://registry.npmjs.org/@deck.gl/react/-/react-8.5.6.tgz", @@ -5566,14 +5450,11 @@ }, "dependencies": { "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", "dev": true, - "optional": true, - "requires": { - "minimist": "^1.2.5" - } + "optional": true }, "loader-utils": { "version": "2.0.2", diff --git a/package.json b/package.json index d181674b0d..d30bae878a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.274-10", + "version": "1.0.0-assets.274-11", "description": "CARTO UI frontend", "repository": { "type": "git", @@ -25,14 +25,6 @@ "@carto/toolkit-custom-storage": "0.0.1-rc.18", "@carto/viewer": "github:CartoDB/viewer#v1.0.8", "@carto/zera": "1.0.7", - "@deck.gl/aggregation-layers": "8.7.5", - "@deck.gl/carto": "8.7.5", - "@deck.gl/core": "8.7.5", - "@deck.gl/extensions": "8.7.5", - "@deck.gl/geo-layers": "8.7.5", - "@deck.gl/google-maps": "8.7.5", - "@deck.gl/layers": "8.7.5", - "@deck.gl/mesh-layers": "8.7.5", "babel-polyfill": "^6.26.0", "backbone": "1.2.3", "backbone-forms": "0.14.0", @@ -189,6 +181,16 @@ "webpack-merge": "^4.1.3", "webpack-stats-plugin": "0.1.4" }, + "peerDependencies": { + "@deck.gl/aggregation-layers": "^8.7.7", + "@deck.gl/carto": "^8.7.7", + "@deck.gl/core": "^8.7.7", + "@deck.gl/extensions": "^8.7.7", + "@deck.gl/geo-layers": "^8.7.7", + "@deck.gl/google-maps": "^8.7.7", + "@deck.gl/layers": "^8.7.7", + "@deck.gl/mesh-layers": "^8.7.7" + }, "optionalDependencies": { "fsevents": "*" }, diff --git a/vue.config.js b/vue.config.js index ff221f812f..2385011e52 100644 --- a/vue.config.js +++ b/vue.config.js @@ -61,5 +61,6 @@ module.exports = { name: '../../images/do-catalog/[name].[hash:8].[ext]' })); } + config.externals([/^@deck.gl\/.+$/]); } };