From ea0c12021d396f6a23da767d7077dc1c8f9c703f Mon Sep 17 00:00:00 2001 From: Taro Matsuzawa Date: Tue, 21 Sep 2021 22:45:13 +0900 Subject: [PATCH 1/2] merge gitignore --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index aefbe336..73581ca4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -example/bundle.js -example/bundle.js.LICENSE.txt +example/*bundle.js +example/*bundle.js.LICENSE.txt # Logs logs From edf5b87bd1ae372f0c62e581c5551a5e93a66989 Mon Sep 17 00:00:00 2001 From: Taro Matsuzawa Date: Tue, 21 Sep 2021 22:46:06 +0900 Subject: [PATCH 2/2] bump maplibre-gl 1.15.1 and add dependency types --- package.json | 5 +++-- yarn.lock | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 524d9ece..55d9be80 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,9 @@ }, "homepage": "https://github.com/watergis/maplibre-gl-export#readme", "devDependencies": { - "@types/maplibre-gl": "^1.13.1", + "@types/maplibre-gl": "^1.14.0", "@typescript-eslint/eslint-plugin": "^4.18.0", + "@types/geojson": "^7946.0.7", "@typescript-eslint/parser": "^4.18.0", "css-loader": "^5.2.4", "es6-promise": "^4.2.8", @@ -56,6 +57,6 @@ "file-saver": "^2.0.5", "js-loading-overlay": "^1.2.0", "jspdf": "^2.3.1", - "maplibre-gl": "^1.14.0" + "maplibre-gl": "^1.15.2" } } diff --git a/yarn.lock b/yarn.lock index 0b072344..95150ec3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -147,10 +147,10 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw== -"@types/geojson@*": - version "7946.0.7" - resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad" - integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ== +"@types/geojson@^7946.0.7": + version "7946.0.8" + resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca" + integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA== "@types/glob@^7.1.1": version "7.1.3" @@ -175,12 +175,12 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= -"@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/minimatch@*": version "3.0.4" @@ -3208,10 +3208,10 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -maplibre-gl@^1.14.0: - version "1.14.0" - resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-1.14.0.tgz#035663dae6cbaaca5b06024f6c5b51a42db1fc84" - integrity sha512-pqr/nsoZHx1rUY2Bpp0EFVcFVgrVOLkDDh2DhZcLVZVHYXdFOH/LyKUoLZda/3/CDTmlZy9ldJeZN8O0g1Ocpg== +maplibre-gl@*, 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"