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

[Maps] Replace mapbox-gl import with maplibre-gl #104505

Merged
merged 19 commits into from
Aug 30, 2021
Merged

[Maps] Replace mapbox-gl import with maplibre-gl #104505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9ade654
replace import
thomasneirynck Jul 6, 2021
611cbcd
fix import
thomasneirynck Jul 6, 2021
a845b2d
Merge branch 'master' of github.com:elastic/kibana into maps/maplibre…
thomasneirynck Jul 6, 2021
36ae9c1
Merge branch 'master' of github.com:elastic/kibana into maps/maplibre…
thomasneirynck Jul 13, 2021
367a863
upgrade
thomasneirynck Jul 13, 2021
bf2a150
Merge branch 'master' into maps/maplibre-switch
kibanamachine Jul 22, 2021
d2a66a5
Merge branch 'master' into maps/maplibre-switch
kibanamachine Aug 11, 2021
cd3b45b
Merge branch 'master' into maps/maplibre-switch
kibanamachine Aug 12, 2021
bc34109
Merge branch 'master' into maps/maplibre-switch
kibanamachine Aug 13, 2021
1b7f2bf
Merge branch 'master' into maps/maplibre-switch
kibanamachine Aug 17, 2021
628af71
Merge branch 'master' into maps/maplibre-switch
kibanamachine Aug 17, 2021
58a6860
Merge branch 'master' of github.com:elastic/kibana into maps/maplibre…
thomasneirynck Aug 24, 2021
0afd2f6
Merge branch 'master' into maps/maplibre-switch
kibanamachine Aug 24, 2021
ac27e1f
Update packages/kbn-mapbox-gl/BUILD.bazel
thomasneirynck Aug 25, 2021
028acbe
Update package.json
thomasneirynck Aug 25, 2021
7dfaa0b
commit yarn lock
thomasneirynck Aug 25, 2021
3dfcdfe
Merge branch 'master' of github.com:elastic/kibana into maps/maplibre…
thomasneirynck Aug 27, 2021
675198f
yarn lock
thomasneirynck Aug 27, 2021
1a5120b
Merge branch 'master' into maps/maplibre-switch
kibanamachine Aug 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
"lodash": "^4.17.21",
"lru-cache": "^4.1.5",
"lz-string": "^1.4.4",
"mapbox-gl": "1.13.1",
"maplibre-gl": "1.15.2",
"mapbox-gl-draw-rectangle-mode": "1.0.4",
"markdown-it": "^10.0.0",
"md5": "^2.1.0",
Expand Down Expand Up @@ -572,7 +572,6 @@
"@types/lodash": "^4.14.159",
"@types/lru-cache": "^5.1.0",
"@types/lz-string": "^1.3.34",
"@types/mapbox-gl": "1.13.1",
"@types/markdown-it": "^0.0.7",
"@types/md5": "^2.2.0",
"@types/memoize-one": "^4.1.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/kbn-mapbox-gl/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ NPM_MODULE_EXTRA_FILES = [
RUNTIME_DEPS = [
"@npm//@mapbox/mapbox-gl-rtl-text",
"@npm//file-loader",
"@npm//mapbox-gl",
"@npm//maplibre-gl",
]

TYPES_DEPS = [
"@npm//@mapbox/mapbox-gl-rtl-text",
"@npm//file-loader",
"@npm//@types/mapbox-gl",
"@npm//maplibre-gl",
]

jsts_transpiler(
Expand Down
8 changes: 4 additions & 4 deletions packages/kbn-mapbox-gl/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ import type {
MapboxGeoJSONFeature,
Point,
CustomLayerInterface,
} from 'mapbox-gl';
import mapboxgl from 'mapbox-gl/dist/mapbox-gl-csp';
} from 'maplibre-gl';
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!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';

mapboxgl.workerUrl = mbWorkerUrl;
mapboxgl.setRTLTextPlugin(mbRtlPlugin);
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-mapbox-gl/src/typings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
25 changes: 9 additions & 16 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5524,13 +5524,6 @@
resolved "https://registry.yarnpkg.com/@types/lz-string/-/lz-string-1.3.34.tgz#69bfadde419314b4a374bf2c8e58659c035ed0a5"
integrity sha512-j6G1e8DULJx3ONf6NdR5JiR2ZY3K3PaaqiEuKYkLQO0Czfi1AzrtjfnfCROyWGeDd5IVMKCwsgSmMip9OWijow==

"@types/[email protected]":
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"
Expand Down Expand Up @@ -19071,10 +19064,15 @@ [email protected]:
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==

[email protected]:
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==

[email protected]:
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"
Expand All @@ -19100,11 +19098,6 @@ [email protected]:
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"
Expand Down