From f1ce8cd07e4c2feafe46f6e6885f80a144f3f95c Mon Sep 17 00:00:00 2001 From: Mateusz Banaszak Date: Mon, 5 Aug 2024 13:00:33 +0200 Subject: [PATCH 1/2] chore: upgrade mapbox and SDK versions --- package-lock.json | 110 +++++++++++------- packages/map-template/package.json | 2 +- .../components/MapTemplate/MapTemplate.jsx | 4 +- 3 files changed, 73 insertions(+), 43 deletions(-) diff --git a/package-lock.json b/package-lock.json index 66132512..cc61fbee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4490,17 +4490,6 @@ "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@mapbox/geojson-rewind": { - "version": "0.5.2", - "license": "ISC", - "dependencies": { - "get-stream": "^6.0.1", - "minimist": "^1.2.6" - }, - "bin": { - "geojson-rewind": "geojson-rewind" - } - }, "node_modules/@mapbox/jsonlint-lines-primitives": { "version": "2.0.2", "engines": { @@ -7867,8 +7856,9 @@ "dev": true }, "node_modules/@types/geojson": { - "version": "7946.0.10", - "license": "MIT" + "version": "7946.0.14", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz", + "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==" }, "node_modules/@types/google.maps": { "version": "3.51.1", @@ -7957,6 +7947,21 @@ "@types/node": "*" } }, + "node_modules/@types/mapbox__point-geometry": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.4.tgz", + "integrity": "sha512-mUWlSxAmYLfwnRBmgYV86tgYmMIICX4kza8YnE/eIlywGe2XoOxlpVnXWwir92xRLjwyarqwpu2EJKD2pk0IUA==" + }, + "node_modules/@types/mapbox__vector-tile": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.4.tgz", + "integrity": "sha512-bpd8dRn9pr6xKvuEBQup8pwQfD4VUyqO/2deGjfpe6AwC8YRlyEipvefyRJUSiCJTZuCb8Pl1ciVV5ekqJ96Bg==", + "dependencies": { + "@types/geojson": "*", + "@types/mapbox__point-geometry": "*", + "@types/pbf": "*" + } + }, "node_modules/@types/minimatch": { "version": "3.0.5", "license": "MIT" @@ -7982,6 +7987,11 @@ "devOptional": true, "license": "MIT" }, + "node_modules/@types/pbf": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.5.tgz", + "integrity": "sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA==" + }, "node_modules/@types/prop-types": { "version": "15.7.5", "dev": true, @@ -9594,9 +9604,9 @@ "license": "MIT" }, "node_modules/cheap-ruler": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/cheap-ruler/-/cheap-ruler-3.0.2.tgz", - "integrity": "sha512-02T332h1/HTN6cDSufLP8x4JzDs2+VC+8qZ/N0kWIVPyc2xUkWwWh3B2fJxR7raXkL4Mq7k554mfuM9ofv/vGg==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cheap-ruler/-/cheap-ruler-4.0.0.tgz", + "integrity": "sha512-0BJa8f4t141BYKQyn9NSQt1PguFQXMXwZiA5shfoaBYHAb2fFk2RAX+tiWMoQU+Agtzt3mdt0JtuyshAXqZ+Vw==" }, "node_modules/chokidar": { "version": "3.5.3", @@ -11223,6 +11233,7 @@ }, "node_modules/earcut": { "version": "2.2.4", + "dev": true, "license": "ISC" }, "node_modules/ecc-jsbn": { @@ -12837,8 +12848,9 @@ } }, "node_modules/geojson-vt": { - "version": "3.2.1", - "license": "ISC" + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-4.0.2.tgz", + "integrity": "sha512-AV9ROqlNqoZEIJGfm1ncNjEXfkz2hdFlZf0qkVfmkwdKa8vj7H16YUOT81rJw1rdFhyEDlN2Tds91p/glzbl5A==" }, "node_modules/get-caller-file": { "version": "2.0.5", @@ -16957,11 +16969,10 @@ } }, "node_modules/mapbox-gl": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-3.3.0.tgz", - "integrity": "sha512-cVeAu9PxPTx113AnJAzcSKbBtL5F5EpJ6/NuYgNib9zNduNSoDG2oVX6xK0bAP/VwwVwRh9SEhcyM7nh4GThvQ==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-3.5.2.tgz", + "integrity": "sha512-KUrmDmLFKPp3MSsWGNTH5uvtYwJknV+eFJ+vxiN6hqKpzbme37z+JfYs5Mehs3CgFaIV/pUdnEV9UPUZJPuS+Q==", "dependencies": { - "@mapbox/geojson-rewind": "^0.5.2", "@mapbox/jsonlint-lines-primitives": "^2.0.2", "@mapbox/mapbox-gl-supported": "^3.0.0", "@mapbox/point-geometry": "^0.1.0", @@ -16969,28 +16980,45 @@ "@mapbox/unitbezier": "^0.0.1", "@mapbox/vector-tile": "^1.3.1", "@mapbox/whoots-js": "^3.1.0", - "cheap-ruler": "^3.0.1", + "@types/geojson": "^7946.0.14", + "@types/mapbox__vector-tile": "^1.3.4", + "cheap-ruler": "^4.0.0", "csscolorparser": "~1.0.3", - "earcut": "^2.2.4", + "earcut": "^3.0.0", "fflate": "^0.8.1", - "geojson-vt": "^3.2.1", + "geojson-vt": "^4.0.2", "gl-matrix": "^3.4.3", "grid-index": "^1.1.0", - "kdbush": "^4.0.1", + "kdbush": "^4.0.2", "lodash.clonedeep": "^4.5.0", "murmurhash-js": "^1.0.0", "pbf": "^3.2.1", "potpack": "^2.0.0", - "quickselect": "^2.0.0", + "quickselect": "^3.0.0", "rw": "^1.3.3", "serialize-to-js": "^3.1.2", - "supercluster": "^8.0.0", - "tiny-lru": "^11.2.5", - "tinyqueue": "^2.0.3", - "tweakpane": "^4.0.3", + "supercluster": "^8.0.1", + "tiny-lru": "^11.2.11", + "tinyqueue": "^3.0.0", + "tweakpane": "^4.0.4", "vt-pbf": "^3.1.3" } }, + "node_modules/mapbox-gl/node_modules/earcut": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/earcut/-/earcut-3.0.0.tgz", + "integrity": "sha512-41Fs7Q/PLq1SDbqjsgcY7GA42T0jvaCNGXgGtsNdvg+Yv8eIu06bxv4/PoREkZ9nMDNwnUSG9OFB9+yv8eKhDg==" + }, + "node_modules/mapbox-gl/node_modules/quickselect": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-3.0.0.tgz", + "integrity": "sha512-XdjUArbK4Bm5fLLvlm5KpTFOiOThgfWWI4axAZDWg4E/0mKdZyI9tNEfds27qCi1ze/vwTR16kvmmGhRra3c2g==" + }, + "node_modules/mapbox-gl/node_modules/tinyqueue": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-3.0.0.tgz", + "integrity": "sha512-gRa9gwYU3ECmQYv3lslts5hxuIa90veaEcxDYuu3QGOIAEM2mOZkVHp48ANJuu1CURtRdHKUBY5Lm1tHV+sD4g==" + }, "node_modules/markdown-it": { "version": "13.0.1", "license": "MIT", @@ -20207,6 +20235,7 @@ }, "node_modules/quickselect": { "version": "2.0.0", + "dev": true, "license": "ISC" }, "node_modules/rbush": { @@ -22353,9 +22382,9 @@ "dev": true }, "node_modules/tiny-lru": { - "version": "11.2.5", - "resolved": "https://registry.npmjs.org/tiny-lru/-/tiny-lru-11.2.5.tgz", - "integrity": "sha512-JpqM0K33lG6iQGKiigcwuURAKZlq6rHXfrgeL4/I8/REoyJTGU+tEMszvT/oTRVHG2OiylhGDjqPp1jWMlr3bw==", + "version": "11.2.11", + "resolved": "https://registry.npmjs.org/tiny-lru/-/tiny-lru-11.2.11.tgz", + "integrity": "sha512-27BIW0dIWTYYoWNnqSmoNMKe5WIbkXsc0xaCQHd3/3xT2XMuMJrzHdrO9QBFR14emBz1Bu0dOAs2sCBBrvgPQA==", "engines": { "node": ">=12" } @@ -22367,6 +22396,7 @@ }, "node_modules/tinyqueue": { "version": "2.0.3", + "dev": true, "license": "ISC" }, "node_modules/tmp": { @@ -22593,9 +22623,9 @@ "dev": true }, "node_modules/tweakpane": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/tweakpane/-/tweakpane-4.0.3.tgz", - "integrity": "sha512-BlcWOAe8oe4c+k9pmLBARGdWB6MVZMszayekkixQXTgkxTaYoTUpHpwVEp+3HkoamZkomodpbBf0CkguIHTgLg==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/tweakpane/-/tweakpane-4.0.4.tgz", + "integrity": "sha512-RkWD54zDlEbnN01wQPk0ANHGbdCvlJx/E8A1QxhTfCbX+ROWos1Ws2MnhOm39aUGMOh+36TjUwpDmLfmwTr1Fg==", "funding": { "url": "https://github.com/sponsors/cocopon" } @@ -23983,7 +24013,7 @@ }, "packages/components": { "name": "@mapsindoors/components", - "version": "13.20.1", + "version": "13.20.2", "license": "MIT", "dependencies": { "@11ty/eleventy": "^2.0.1", @@ -24023,7 +24053,7 @@ }, "packages/map-template": { "name": "@mapsindoors/map-template", - "version": "1.52.0", + "version": "1.54.2", "devDependencies": { "@googlemaps/js-api-loader": "^1.15.1", "@mapsindoors/components": "*", @@ -24039,7 +24069,7 @@ "eslint": "^8.39.0", "eslint-config-react-app": "^7.0.1", "i18next": "^23.7.7", - "mapbox-gl": "^3.3.0", + "mapbox-gl": "^3.5.2", "prop-types": "^15.8.1", "qrcode": "^1.5.3", "react": "^18.2.0", diff --git a/packages/map-template/package.json b/packages/map-template/package.json index dddce5c4..c19624bf 100644 --- a/packages/map-template/package.json +++ b/packages/map-template/package.json @@ -22,7 +22,7 @@ "eslint": "^8.39.0", "eslint-config-react-app": "^7.0.1", "i18next": "^23.7.7", - "mapbox-gl": "^3.3.0", + "mapbox-gl": "^3.5.2", "prop-types": "^15.8.1", "qrcode": "^1.5.3", "react": "^18.2.0", diff --git a/packages/map-template/src/components/MapTemplate/MapTemplate.jsx b/packages/map-template/src/components/MapTemplate/MapTemplate.jsx index 884da80f..7c47a4ea 100644 --- a/packages/map-template/src/components/MapTemplate/MapTemplate.jsx +++ b/packages/map-template/src/components/MapTemplate/MapTemplate.jsx @@ -177,8 +177,8 @@ function MapTemplate({ apiKey, gmApiKey, mapboxAccessToken, venue, locationId, p const miSdkApiTag = document.createElement('script'); miSdkApiTag.setAttribute('type', 'text/javascript'); - miSdkApiTag.setAttribute('src', 'https://app.mapsindoors.com/mapsindoors/js/sdk/4.35.0/mapsindoors-4.35.0.js.gz'); - miSdkApiTag.setAttribute('integrity', 'sha384-p/2HpbrD2kC/E62E6RgoVk6NgJN6yGD9o1zbTjNzu933wucQZBvIlyTjCbNVbMMP'); + miSdkApiTag.setAttribute('src', 'https://app.mapsindoors.com/mapsindoors/js/sdk/4.36.1/mapsindoors-4.36.1.js.gz'); + miSdkApiTag.setAttribute('integrity', 'sha384-1q0Vh8TQZcjeSByW22njbeVz4E327cilRcZZs6uAOS5ZihXmonR7Qm02nvg/vTIR'); miSdkApiTag.setAttribute('crossorigin', 'anonymous'); document.body.appendChild(miSdkApiTag); miSdkApiTag.onload = () => { From 103aed819ac8b50352bead4ecda99565ebc6d2e0 Mon Sep 17 00:00:00 2001 From: Mateusz Banaszak Date: Tue, 6 Aug 2024 08:47:15 +0200 Subject: [PATCH 2/2] add: changelog --- packages/map-template/CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/map-template/CHANGELOG.md b/packages/map-template/CHANGELOG.md index cccc2959..8358f68f 100644 --- a/packages/map-template/CHANGELOG.md +++ b/packages/map-template/CHANGELOG.md @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.54.3] - 2024-08-06 + +### Added + +- Upgraded to MapsIndoors SDK v4.36.1. +- Upgraded to mapbox-gl v3.5.2. + ## [1.54.2] - 2024-07-31 ### Fixed