From 9ade654736b0e9be0277225e1ec973340bc37b10 Mon Sep 17 00:00:00 2001 From: Thomas Neirynck Date: Tue, 6 Jul 2021 18:55:22 +0200 Subject: [PATCH 1/7] replace import --- package.json | 4 ++-- packages/kbn-mapbox-gl/BUILD.bazel | 4 ++-- packages/kbn-mapbox-gl/src/index.ts | 9 +++++---- packages/kbn-mapbox-gl/src/typings.ts | 2 +- yarn.lock | 24 ++++++++++++------------ 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 2e22a4e0ccf77..e91963a69b182 100644 --- a/package.json +++ b/package.json @@ -291,7 +291,7 @@ "lodash": "^4.17.21", "lru-cache": "^4.1.5", "lz-string": "^1.4.4", - "mapbox-gl": "1.13.1", + "maplibre-gl": "1.15.0", "mapbox-gl-draw-rectangle-mode": "1.0.4", "markdown-it": "^10.0.0", "md5": "^2.1.0", @@ -570,7 +570,7 @@ "@types/loader-utils": "^1.1.3", "@types/lodash": "^4.14.159", "@types/lru-cache": "^5.1.0", - "@types/mapbox-gl": "1.13.1", + "@types/maplibre-gl": "1.13.1", "@types/markdown-it": "^0.0.7", "@types/md5": "^2.2.0", "@types/memoize-one": "^4.1.0", diff --git a/packages/kbn-mapbox-gl/BUILD.bazel b/packages/kbn-mapbox-gl/BUILD.bazel index 7d7186068832e..3b04d730cc525 100644 --- a/packages/kbn-mapbox-gl/BUILD.bazel +++ b/packages/kbn-mapbox-gl/BUILD.bazel @@ -29,11 +29,11 @@ NPM_MODULE_EXTRA_FILES = [ SRC_DEPS = [ "@npm//@mapbox/mapbox-gl-rtl-text", "@npm//file-loader", - "@npm//mapbox-gl", + "@npm//maplibre-gl", ] TYPES_DEPS = [ - "@npm//@types/mapbox-gl", + "@npm//@types/maplibre-gl", ] DEPS = SRC_DEPS + TYPES_DEPS diff --git a/packages/kbn-mapbox-gl/src/index.ts b/packages/kbn-mapbox-gl/src/index.ts index 404684af78031..b1c6add5ac1d2 100644 --- a/packages/kbn-mapbox-gl/src/index.ts +++ b/packages/kbn-mapbox-gl/src/index.ts @@ -24,14 +24,15 @@ import type { MapboxGeoJSONFeature, Point, CustomLayerInterface, -} from 'mapbox-gl'; -import mapboxgl from 'mapbox-gl/dist/mapbox-gl-csp'; +} from 'maplibre-gl'; +import maplibregl from 'maplibre-gl/dist/maplibre-gl-csp'; // @ts-expect-error import mbRtlPlugin from '!!file-loader!@mapbox/mapbox-gl-rtl-text/mapbox-gl-rtl-text.min.js'; // @ts-expect-error -import mbWorkerUrl from '!!file-loader!mapbox-gl/dist/mapbox-gl-csp-worker'; -import 'mapbox-gl/dist/mapbox-gl.css'; +import mbWorkerUrl from '!!file-loader!maplibre-gl/dist/maplibre-gl-csp-worker'; +import 'maplibre-gl/dist/maplibre-gl.css'; +const mapboxgl = maplibregl; mapboxgl.workerUrl = mbWorkerUrl; mapboxgl.setRTLTextPlugin(mbRtlPlugin); diff --git a/packages/kbn-mapbox-gl/src/typings.ts b/packages/kbn-mapbox-gl/src/typings.ts index 0cc6908aca428..76d8850cc1d6f 100644 --- a/packages/kbn-mapbox-gl/src/typings.ts +++ b/packages/kbn-mapbox-gl/src/typings.ts @@ -7,4 +7,4 @@ */ // Mapbox-gl doesn't declare this type. -declare module 'mapbox-gl/dist/mapbox-gl-csp'; +declare module 'maplibre-gl/dist/maplibre-gl-csp'; diff --git a/yarn.lock b/yarn.lock index ea968cf3631f2..199ea08232f4e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5370,10 +5370,10 @@ resolved "https://registry.yarnpkg.com/@types/lru-cache/-/lru-cache-5.1.0.tgz#57f228f2b80c046b4a1bd5cac031f81f207f4f03" integrity sha512-RaE0B+14ToE4l6UqdarKPnXwVDuigfFv+5j9Dze/Nqr23yyuqdNvzcZi3xB+3Agvi5R4EOgAksfv3lXX4vBt9w== -"@types/mapbox-gl@1.13.1": +"@types/maplibre-gl@1.13.1": version "1.13.1" - resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-1.13.1.tgz#bd8108f912f32c895117e2970b6d4fbbecbe42a1" - integrity sha512-Yqv1eFAzG2gdecc94higNC8KE+BR6t8QhFgbQGGEpKr3OgSVVtr2qaBNBPaGlIAtCoKDF6JGB2haOhvijYC4Bg== + resolved "https://registry.yarnpkg.com/@types/maplibre-gl/-/maplibre-gl-1.13.1.tgz#d043f48e9f08e1b6a9aa7e924d2b86306f843f2b" + integrity sha512-AD7gFneLUYOWKhiwUvfD3LmQy4agJ2k2fe2V6XWCmt6R41d1q1H+BuyHJxFg31OTtDCag4u9ZZpQbjUmUG0gjQ== dependencies: "@types/geojson" "*" @@ -18882,10 +18882,15 @@ mapbox-gl-draw-rectangle-mode@1.0.4: resolved "https://registry.yarnpkg.com/mapbox-gl-draw-rectangle-mode/-/mapbox-gl-draw-rectangle-mode-1.0.4.tgz#42987d68872a5fb5cc5d76d3375ee20cd8bab8f7" integrity sha512-BdF6nwEK2p8n9LQoMPzBO8LhddW1fe+d5vK8HQIei+4VcRnUbKNsEj7Z15FsJxCHzsc2BQKXbESx5GaE8x0imQ== -mapbox-gl@1.13.1: - version "1.13.1" - resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-1.13.1.tgz#322efe75ab4c764fc4c776da1506aad58d5a5b9d" - integrity sha512-GSyubcoSF5MyaP8z+DasLu5v7KmDK2pp4S5+VQ5WdVQUOaAqQY4jwl4JpcdNho3uWm2bIKs7x1l7q3ynGmW60g== +mapcap@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/mapcap/-/mapcap-1.0.0.tgz#e8e29d04a160eaf8c92ec4bcbd2c5d07ed037e5a" + integrity sha512-KcNlZSlFPx+r1jYZmxEbTVymG+dIctf10WmWkuhrhrblM+KMoF77HelwihL5cxYlORye79KoR4IlOOk99lUJ0g== + +maplibre-gl@1.15.0: + version "1.15.0" + resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-1.15.0.tgz#6efa96b5fdda218390cb9db3eb1e901dc6ca9f51" + integrity sha512-C3Mq7HDTndvAs8w+Ai1QzvVdN7xG2+2iHjtp3Pkmk7tJeSMcqZzQYHKyOCBkpTs7g2P/aFqMU8Tg853RIZxIZg== dependencies: "@mapbox/geojson-rewind" "^0.5.0" "@mapbox/geojson-types" "^1.0.2" @@ -18911,11 +18916,6 @@ mapbox-gl@1.13.1: tinyqueue "^2.0.3" vt-pbf "^3.1.1" -mapcap@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/mapcap/-/mapcap-1.0.0.tgz#e8e29d04a160eaf8c92ec4bcbd2c5d07ed037e5a" - integrity sha512-KcNlZSlFPx+r1jYZmxEbTVymG+dIctf10WmWkuhrhrblM+KMoF77HelwihL5cxYlORye79KoR4IlOOk99lUJ0g== - marge@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/marge/-/marge-1.0.1.tgz#52d6026911e62e1dd1cf60a07313dde285a8370c" From 611cbcdb3530f158374ecd83f52556be61556b66 Mon Sep 17 00:00:00 2001 From: Thomas Neirynck Date: Tue, 6 Jul 2021 19:39:50 +0200 Subject: [PATCH 2/7] fix import --- .../draw_control/draw_feature_control/draw_feature_control.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx index 9f2b99b9c41ab..7b408df3a8134 100644 --- a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx +++ b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx @@ -6,7 +6,7 @@ */ import React, { Component } from 'react'; -import { Map as MbMap, Point as MbPoint } from 'mapbox-gl'; +import { Map as MbMap, Point as MbPoint } from '@kbn/mapbox-gl'; // @ts-expect-error import MapboxDraw from '@mapbox/mapbox-gl-draw'; import { Feature, Geometry, Position } from 'geojson'; From 367a863dbcd2411aac14aef51b4cb64b6648b58c Mon Sep 17 00:00:00 2001 From: Thomas Neirynck Date: Tue, 13 Jul 2021 19:50:11 +0200 Subject: [PATCH 3/7] upgrade --- package.json | 4 +-- packages/kbn-mapbox-gl/src/index.ts | 3 +-- yarn.lock | 41 ++++++++++++++++++++++++----- 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index da2b890514efa..ee6722e1d83bf 100644 --- a/package.json +++ b/package.json @@ -292,7 +292,7 @@ "lodash": "^4.17.21", "lru-cache": "^4.1.5", "lz-string": "^1.4.4", - "maplibre-gl": "1.15.0", + "maplibre-gl": "1.15.2", "mapbox-gl-draw-rectangle-mode": "1.0.4", "markdown-it": "^10.0.0", "md5": "^2.1.0", @@ -573,7 +573,7 @@ "@types/loader-utils": "^1.1.3", "@types/lodash": "^4.14.159", "@types/lru-cache": "^5.1.0", - "@types/maplibre-gl": "1.13.1", + "@types/maplibre-gl": "1.14.0", "@types/markdown-it": "^0.0.7", "@types/md5": "^2.2.0", "@types/memoize-one": "^4.1.0", diff --git a/packages/kbn-mapbox-gl/src/index.ts b/packages/kbn-mapbox-gl/src/index.ts index b1c6add5ac1d2..1f371d2061fa6 100644 --- a/packages/kbn-mapbox-gl/src/index.ts +++ b/packages/kbn-mapbox-gl/src/index.ts @@ -25,14 +25,13 @@ import type { Point, CustomLayerInterface, } from 'maplibre-gl'; -import maplibregl from 'maplibre-gl/dist/maplibre-gl-csp'; +import mapboxgl from 'maplibre-gl/dist/maplibre-gl-csp'; // @ts-expect-error import mbRtlPlugin from '!!file-loader!@mapbox/mapbox-gl-rtl-text/mapbox-gl-rtl-text.min.js'; // @ts-expect-error import mbWorkerUrl from '!!file-loader!maplibre-gl/dist/maplibre-gl-csp-worker'; import 'maplibre-gl/dist/maplibre-gl.css'; -const mapboxgl = maplibregl; mapboxgl.workerUrl = mbWorkerUrl; mapboxgl.setRTLTextPlugin(mbRtlPlugin); diff --git a/yarn.lock b/yarn.lock index 3c7cb9fcf17d6..ef687d49dc42a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5504,12 +5504,12 @@ resolved "https://registry.yarnpkg.com/@types/lru-cache/-/lru-cache-5.1.0.tgz#57f228f2b80c046b4a1bd5cac031f81f207f4f03" integrity sha512-RaE0B+14ToE4l6UqdarKPnXwVDuigfFv+5j9Dze/Nqr23yyuqdNvzcZi3xB+3Agvi5R4EOgAksfv3lXX4vBt9w== -"@types/maplibre-gl@1.13.1": - version "1.13.1" - resolved "https://registry.yarnpkg.com/@types/maplibre-gl/-/maplibre-gl-1.13.1.tgz#d043f48e9f08e1b6a9aa7e924d2b86306f843f2b" - integrity sha512-AD7gFneLUYOWKhiwUvfD3LmQy4agJ2k2fe2V6XWCmt6R41d1q1H+BuyHJxFg31OTtDCag4u9ZZpQbjUmUG0gjQ== +"@types/maplibre-gl@1.14.0": + version "1.14.0" + resolved "https://registry.yarnpkg.com/@types/maplibre-gl/-/maplibre-gl-1.14.0.tgz#244f1763f0a1e29e7124e5b7c665793e8256920e" + integrity sha512-I6ibscT7UdL1oOqqCz9s1gjcolLaUPkHIIfMLusczTvlsMhjORyS6sE1g4V/NESAOL5KhNQX3/31LJH+OCGjkg== dependencies: - "@types/geojson" "*" + maplibre-gl "*" "@types/markdown-it@^0.0.7": version "0.0.7" @@ -19005,7 +19005,7 @@ mapcap@^1.0.0: resolved "https://registry.yarnpkg.com/mapcap/-/mapcap-1.0.0.tgz#e8e29d04a160eaf8c92ec4bcbd2c5d07ed037e5a" integrity sha512-KcNlZSlFPx+r1jYZmxEbTVymG+dIctf10WmWkuhrhrblM+KMoF77HelwihL5cxYlORye79KoR4IlOOk99lUJ0g== -maplibre-gl@1.15.0: +maplibre-gl@*: version "1.15.0" resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-1.15.0.tgz#6efa96b5fdda218390cb9db3eb1e901dc6ca9f51" integrity sha512-C3Mq7HDTndvAs8w+Ai1QzvVdN7xG2+2iHjtp3Pkmk7tJeSMcqZzQYHKyOCBkpTs7g2P/aFqMU8Tg853RIZxIZg== @@ -19034,6 +19034,35 @@ maplibre-gl@1.15.0: tinyqueue "^2.0.3" vt-pbf "^3.1.1" +maplibre-gl@1.15.2: + version "1.15.2" + resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-1.15.2.tgz#7fb47868b62455af916c090903f2154394450f9c" + integrity sha512-uPeV530apb4JfX3cRFfE+awFnbcJTOnCv2QvY4mw4huiInbybElWYkNzTs324YLSADq0f4bidRoYcR81ho3aLA== + dependencies: + "@mapbox/geojson-rewind" "^0.5.0" + "@mapbox/geojson-types" "^1.0.2" + "@mapbox/jsonlint-lines-primitives" "^2.0.2" + "@mapbox/mapbox-gl-supported" "^1.5.0" + "@mapbox/point-geometry" "^0.1.0" + "@mapbox/tiny-sdf" "^1.1.1" + "@mapbox/unitbezier" "^0.0.0" + "@mapbox/vector-tile" "^1.3.1" + "@mapbox/whoots-js" "^3.1.0" + csscolorparser "~1.0.3" + earcut "^2.2.2" + geojson-vt "^3.2.1" + gl-matrix "^3.2.1" + grid-index "^1.1.0" + minimist "^1.2.5" + murmurhash-js "^1.0.0" + pbf "^3.2.1" + potpack "^1.0.1" + quickselect "^2.0.0" + rw "^1.3.3" + supercluster "^7.1.0" + tinyqueue "^2.0.3" + vt-pbf "^3.1.1" + marge@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/marge/-/marge-1.0.1.tgz#52d6026911e62e1dd1cf60a07313dde285a8370c" From ac27e1fd750012b3c8aee9aeacbbd0674f369cdf Mon Sep 17 00:00:00 2001 From: Thomas Neirynck Date: Wed, 25 Aug 2021 09:26:55 -0400 Subject: [PATCH 4/7] Update packages/kbn-mapbox-gl/BUILD.bazel Co-authored-by: Tiago Costa --- packages/kbn-mapbox-gl/BUILD.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kbn-mapbox-gl/BUILD.bazel b/packages/kbn-mapbox-gl/BUILD.bazel index afe1c52bde2f3..00b3213c4dea7 100644 --- a/packages/kbn-mapbox-gl/BUILD.bazel +++ b/packages/kbn-mapbox-gl/BUILD.bazel @@ -36,7 +36,7 @@ RUNTIME_DEPS = [ TYPES_DEPS = [ "@npm//@mapbox/mapbox-gl-rtl-text", "@npm//file-loader", - "@npm//@types/maplibre-gl", + "@npm//maplibre-gl", ] jsts_transpiler( From 028acbe2ff92f8c9cc6df64529374186eae51783 Mon Sep 17 00:00:00 2001 From: Thomas Neirynck Date: Wed, 25 Aug 2021 09:27:06 -0400 Subject: [PATCH 5/7] Update package.json Co-authored-by: Tiago Costa --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 2e4f4e3c12981..182fb59df2764 100644 --- a/package.json +++ b/package.json @@ -570,7 +570,6 @@ "@types/loader-utils": "^1.1.3", "@types/lodash": "^4.14.159", "@types/lru-cache": "^5.1.0", - "@types/maplibre-gl": "1.14.0", "@types/markdown-it": "^0.0.7", "@types/md5": "^2.2.0", "@types/memoize-one": "^4.1.0", From 7dfaa0b2f039126c096cf493b63e6a08922531d8 Mon Sep 17 00:00:00 2001 From: Thomas Neirynck Date: Wed, 25 Aug 2021 09:56:32 -0400 Subject: [PATCH 6/7] commit yarn lock --- yarn.lock | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/yarn.lock b/yarn.lock index d48e8f683f6ff..725f5647b9854 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5519,13 +5519,6 @@ resolved "https://registry.yarnpkg.com/@types/lru-cache/-/lru-cache-5.1.0.tgz#57f228f2b80c046b4a1bd5cac031f81f207f4f03" integrity sha512-RaE0B+14ToE4l6UqdarKPnXwVDuigfFv+5j9Dze/Nqr23yyuqdNvzcZi3xB+3Agvi5R4EOgAksfv3lXX4vBt9w== -"@types/maplibre-gl@1.14.0": - version "1.14.0" - resolved "https://registry.yarnpkg.com/@types/maplibre-gl/-/maplibre-gl-1.14.0.tgz#244f1763f0a1e29e7124e5b7c665793e8256920e" - integrity sha512-I6ibscT7UdL1oOqqCz9s1gjcolLaUPkHIIfMLusczTvlsMhjORyS6sE1g4V/NESAOL5KhNQX3/31LJH+OCGjkg== - dependencies: - maplibre-gl "*" - "@types/markdown-it@^0.0.7": version "0.0.7" resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-0.0.7.tgz#75070485a3d8ad11e7deb8287f4430be15bf4d39" @@ -6198,7 +6191,7 @@ dependencies: "@types/geojson" "*" -"@types/tough-cookie@^4.0.1", "@types/tough-cookie@*": +"@types/tough-cookie@*", "@types/tough-cookie@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.1.tgz#8f80dd965ad81f3e1bc26d6f5c727e132721ff40" integrity sha512-Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg== @@ -19070,35 +19063,6 @@ mapcap@^1.0.0: resolved "https://registry.yarnpkg.com/mapcap/-/mapcap-1.0.0.tgz#e8e29d04a160eaf8c92ec4bcbd2c5d07ed037e5a" integrity sha512-KcNlZSlFPx+r1jYZmxEbTVymG+dIctf10WmWkuhrhrblM+KMoF77HelwihL5cxYlORye79KoR4IlOOk99lUJ0g== -maplibre-gl@*: - version "1.15.0" - resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-1.15.0.tgz#6efa96b5fdda218390cb9db3eb1e901dc6ca9f51" - integrity sha512-C3Mq7HDTndvAs8w+Ai1QzvVdN7xG2+2iHjtp3Pkmk7tJeSMcqZzQYHKyOCBkpTs7g2P/aFqMU8Tg853RIZxIZg== - dependencies: - "@mapbox/geojson-rewind" "^0.5.0" - "@mapbox/geojson-types" "^1.0.2" - "@mapbox/jsonlint-lines-primitives" "^2.0.2" - "@mapbox/mapbox-gl-supported" "^1.5.0" - "@mapbox/point-geometry" "^0.1.0" - "@mapbox/tiny-sdf" "^1.1.1" - "@mapbox/unitbezier" "^0.0.0" - "@mapbox/vector-tile" "^1.3.1" - "@mapbox/whoots-js" "^3.1.0" - csscolorparser "~1.0.3" - earcut "^2.2.2" - geojson-vt "^3.2.1" - gl-matrix "^3.2.1" - grid-index "^1.1.0" - minimist "^1.2.5" - murmurhash-js "^1.0.0" - pbf "^3.2.1" - potpack "^1.0.1" - quickselect "^2.0.0" - rw "^1.3.3" - supercluster "^7.1.0" - tinyqueue "^2.0.3" - vt-pbf "^3.1.1" - maplibre-gl@1.15.2: version "1.15.2" resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-1.15.2.tgz#7fb47868b62455af916c090903f2154394450f9c" From 675198f56bfa88d117caaf98fc6a1f18765ce92e Mon Sep 17 00:00:00 2001 From: Thomas Neirynck Date: Fri, 27 Aug 2021 14:44:21 -0400 Subject: [PATCH 7/7] yarn lock --- yarn.lock | 7 ------- 1 file changed, 7 deletions(-) diff --git a/yarn.lock b/yarn.lock index c1bf2cfbcaba1..1133bc6bf73fe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5524,13 +5524,6 @@ resolved "https://registry.yarnpkg.com/@types/lz-string/-/lz-string-1.3.34.tgz#69bfadde419314b4a374bf2c8e58659c035ed0a5" integrity sha512-j6G1e8DULJx3ONf6NdR5JiR2ZY3K3PaaqiEuKYkLQO0Czfi1AzrtjfnfCROyWGeDd5IVMKCwsgSmMip9OWijow== -"@types/mapbox-gl@1.13.1": - version "1.13.1" - resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-1.13.1.tgz#bd8108f912f32c895117e2970b6d4fbbecbe42a1" - integrity sha512-Yqv1eFAzG2gdecc94higNC8KE+BR6t8QhFgbQGGEpKr3OgSVVtr2qaBNBPaGlIAtCoKDF6JGB2haOhvijYC4Bg== - dependencies: - "@types/geojson" "*" - "@types/markdown-it@^0.0.7": version "0.0.7" resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-0.0.7.tgz#75070485a3d8ad11e7deb8287f4430be15bf4d39"