From d9c8cb83325b9c84ba973259322ee7abcb51dbbf Mon Sep 17 00:00:00 2001 From: Sebastian Pietschner Date: Tue, 8 Nov 2022 09:59:53 +1100 Subject: [PATCH 01/14] fix package json incorrect imports --- package.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c9203e7..b85e5ce 100644 --- a/package.json +++ b/package.json @@ -13,9 +13,14 @@ "maps", "react-azure-maps" ], - "source": "src/react-azure-maps.ts", "module": "dist/react-azure-maps.es5.js", - "typings": "dist/types/react-azure-maps.d.ts", + "types": "dist/types/react-azure-maps.d.ts", + "exports": { + ".": { + "import": "./dist/react-azure-maps.es5.js", + "types": "./dist/types/react-azure-maps.d.ts" + } + }, "files": [ "dist" ], From 1f52cddfec00a30d31708132cf0f67f79a2ff458 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 05:40:01 +0000 Subject: [PATCH 02/14] chore(deps): bump decode-uri-component from 0.2.0 to 0.2.2 Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2. - [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases) - [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2) --- updated-dependencies: - dependency-name: decode-uri-component dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 634a29e..ad98ac4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5286,9 +5286,9 @@ decimal.js@^10.2.1: integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw== decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz" - integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= + version "0.2.2" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" + integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== dedent@^0.7.0: version "0.7.0" From 235f61c37df783e5eae0169cde2aa7db82678900 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 12:20:03 +0000 Subject: [PATCH 03/14] chore(deps): bump qs from 6.5.2 to 6.5.3 Bumps [qs](https://github.com/ljharb/qs) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/ljharb/qs/releases) - [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md) - [Commits](https://github.com/ljharb/qs/compare/v6.5.2...v6.5.3) --- updated-dependencies: - dependency-name: qs dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 634a29e..1a70a45 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11232,9 +11232,9 @@ qs@6.7.0: integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== qs@~6.5.2: - version "6.5.2" - resolved "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + version "6.5.3" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" + integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== query-string@^4.1.0: version "4.3.4" From 6f0c06159e03ced7fb6d8820714b0401de59a4e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Dec 2022 06:32:49 +0000 Subject: [PATCH 04/14] chore(deps): bump express from 4.17.1 to 4.18.2 Bumps [express](https://github.com/expressjs/express) from 4.17.1 to 4.18.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.17.1...4.18.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 390 +++++++++++++++++++++++++++++------------------------- 1 file changed, 210 insertions(+), 180 deletions(-) diff --git a/yarn.lock b/yarn.lock index ad98ac4..ceb43b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2700,13 +2700,13 @@ abbrev@1: resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: - version "1.3.7" - resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz" - integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== +accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: + version "1.3.8" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" + integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== dependencies: - mime-types "~2.1.24" - negotiator "0.6.2" + mime-types "~2.1.34" + negotiator "0.6.3" acorn-globals@^4.3.0: version "4.3.4" @@ -2956,8 +2956,8 @@ array-equal@^1.0.0: array-flatten@1.1.1: version "1.1.1" - resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz" - integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== array-flatten@^2.1.0: version "2.1.2" @@ -3870,21 +3870,23 @@ bn.js@^5.0.0, bn.js@^5.1.1: resolved "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz" integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== -body-parser@1.19.0: - version "1.19.0" - resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz" - integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== +body-parser@1.20.1: + version "1.20.1" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" + integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== dependencies: - bytes "3.1.0" + bytes "3.1.2" content-type "~1.0.4" debug "2.6.9" - depd "~1.1.2" - http-errors "1.7.2" + depd "2.0.0" + destroy "1.2.0" + http-errors "2.0.0" iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.7.0" - raw-body "2.4.0" - type-is "~1.6.17" + on-finished "2.4.1" + qs "6.11.0" + raw-body "2.5.1" + type-is "~1.6.18" + unpipe "1.0.0" bonjour@^3.5.0: version "3.5.0" @@ -4102,7 +4104,12 @@ bytes@3.0.0: resolved "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz" integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= -bytes@3.1.0, bytes@^3.1.0: +bytes@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== + +bytes@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== @@ -4168,7 +4175,7 @@ cache-base@^1.0.1: call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" - resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== dependencies: function-bind "^1.1.1" @@ -4707,16 +4714,16 @@ contains-path@^0.1.0: resolved "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz" integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= -content-disposition@0.5.3: - version "0.5.3" - resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz" - integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== +content-disposition@0.5.4: + version "0.5.4" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" + integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== dependencies: - safe-buffer "5.1.2" + safe-buffer "5.2.1" content-type@~1.0.4: version "1.0.4" - resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== conventional-changelog-angular@^5.0.0: @@ -4763,13 +4770,13 @@ convert-source-map@^0.3.3: cookie-signature@1.0.6: version "1.0.6" - resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" - integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== -cookie@0.4.0: - version "0.4.0" - resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz" - integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== +cookie@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" + integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== copy-concurrently@^1.0.0: version "1.0.5" @@ -5379,6 +5386,11 @@ delayed-stream@~1.0.0: resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= +depd@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + depd@~1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" @@ -5392,10 +5404,10 @@ des.js@^1.0.0: inherits "^2.0.1" minimalistic-assert "^1.0.0" -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz" - integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= +destroy@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" + integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== detect-newline@^3.0.0: version "3.1.0" @@ -5624,8 +5636,8 @@ editorconfig@^0.15.3: ee-first@1.1.1: version "1.1.1" - resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" - integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== ejs@^2.6.1: version "2.7.4" @@ -5682,8 +5694,8 @@ emojis-list@^3.0.0: encodeurl@~1.0.2: version "1.0.2" - resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== end-of-stream@^1.0.0, end-of-stream@^1.1.0: version "1.4.4" @@ -5803,8 +5815,8 @@ escalade@^3.0.2, escalade@^3.1.1: escape-html@~1.0.3: version "1.0.3" - resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== escape-string-regexp@2.0.0, escape-string-regexp@^2.0.0: version "2.0.0" @@ -6108,8 +6120,8 @@ esutils@^2.0.2: etag@~1.8.1: version "1.8.1" - resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz" - integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== eventemitter3@^4.0.0, eventemitter3@^4.0.4: version "4.0.7" @@ -6198,37 +6210,38 @@ expect@^26.6.0, expect@^26.6.2: jest-regex-util "^26.0.0" express@^4.17.1: - version "4.17.1" - resolved "https://registry.npmjs.org/express/-/express-4.17.1.tgz" - integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== + version "4.18.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" + integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== dependencies: - accepts "~1.3.7" + accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.19.0" - content-disposition "0.5.3" + body-parser "1.20.1" + content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.4.0" + cookie "0.5.0" cookie-signature "1.0.6" debug "2.6.9" - depd "~1.1.2" + depd "2.0.0" encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" - finalhandler "~1.1.2" + finalhandler "1.2.0" fresh "0.5.2" + http-errors "2.0.0" merge-descriptors "1.0.1" methods "~1.1.2" - on-finished "~2.3.0" + on-finished "2.4.1" parseurl "~1.3.3" path-to-regexp "0.1.7" - proxy-addr "~2.0.5" - qs "6.7.0" + proxy-addr "~2.0.7" + qs "6.11.0" range-parser "~1.2.1" - safe-buffer "5.1.2" - send "0.17.1" - serve-static "1.14.1" - setprototypeof "1.1.1" - statuses "~1.5.0" + safe-buffer "5.2.1" + send "0.18.0" + serve-static "1.15.0" + setprototypeof "1.2.0" + statuses "2.0.1" type-is "~1.6.18" utils-merge "1.0.1" vary "~1.1.2" @@ -6425,17 +6438,17 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== +finalhandler@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" + integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== dependencies: debug "2.6.9" encodeurl "~1.0.2" escape-html "~1.0.3" - on-finished "~2.3.0" + on-finished "2.4.1" parseurl "~1.3.3" - statuses "~1.5.0" + statuses "2.0.1" unpipe "~1.0.0" find-cache-dir@^2.1.0: @@ -6561,10 +6574,10 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" -forwarded@~0.1.2: - version "0.1.2" - resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz" - integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== fragment-cache@^0.2.1: version "0.2.1" @@ -6575,8 +6588,8 @@ fragment-cache@^0.2.1: fresh@0.5.2: version "0.5.2" - resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz" - integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== from2@^2.1.0: version "2.3.0" @@ -6651,7 +6664,7 @@ fsevents@^2.1.2, fsevents@^2.1.3, fsevents@~2.3.1: function-bind@^1.1.1: version "1.1.1" - resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== functional-red-black-tree@^1.0.1: @@ -6681,7 +6694,16 @@ get-caller-file@^2.0.1: resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: +get-intrinsic@^1.0.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" + integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.3" + +get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz" integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== @@ -6976,6 +6998,11 @@ has-symbols@^1.0.1, has-symbols@^1.0.2: resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz" integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== +has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== + has-value@^0.3.1: version "0.3.1" resolved "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz" @@ -7009,7 +7036,7 @@ has-values@^1.0.0: has@^1.0.0, has@^1.0.1, has@^1.0.3: version "1.0.3" - resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== dependencies: function-bind "^1.1.1" @@ -7182,16 +7209,16 @@ http-deceiver@^1.2.7: resolved "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz" integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= -http-errors@1.7.2: - version "1.7.2" - resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz" - integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== +http-errors@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" + integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" + depd "2.0.0" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses "2.0.1" + toidentifier "1.0.1" http-errors@~1.6.2: version "1.6.3" @@ -7203,17 +7230,6 @@ http-errors@~1.6.2: setprototypeof "1.1.0" statuses ">= 1.4.0 < 2" -http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz" - integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - http-parser-js@>=0.5.1: version "0.5.3" resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz" @@ -7275,7 +7291,7 @@ husky@^4.3.0: iconv-lite@0.4.24: version "0.4.24" - resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== dependencies: safer-buffer ">= 2.1.2 < 3" @@ -9011,8 +9027,8 @@ mdn-data@2.0.4: media-typer@0.3.0: version "0.3.0" - resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== memory-fs@^0.4.1: version "0.4.1" @@ -9049,8 +9065,8 @@ meow@^8.0.0: merge-descriptors@1.0.1: version "1.0.1" - resolved "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz" - integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== merge-source-map@1.0.4: version "1.0.4" @@ -9071,8 +9087,8 @@ merge2@^1.2.3, merge2@^1.3.0: methods@~1.1.2: version "1.1.2" - resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== microevent.ts@~0.1.1: version "0.1.1" @@ -9119,16 +9135,28 @@ mime-db@1.46.0, "mime-db@>= 1.43.0 < 2": resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz" integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ== -mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19: version "2.1.29" resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz" integrity sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ== dependencies: mime-db "1.46.0" +mime-types@~2.1.24, mime-types@~2.1.34: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + mime@1.6.0: version "1.6.0" - resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== mime@>=2.4.6, mime@^2.4.4: @@ -9278,22 +9306,17 @@ move-concurrently@^1.0.1: ms@2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - -ms@2.1.1: - version "2.1.1" - resolved "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== ms@2.1.2: version "2.1.2" resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@^2.1.1: +ms@2.1.3, ms@^2.1.1: version "2.1.3" - resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== multicast-dns-service-types@^1.1.0: @@ -9353,10 +9376,10 @@ natural-compare@^1.4.0: resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -negotiator@0.6.2: - version "0.6.2" - resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== +negotiator@0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== neo-async@^2.5.0, neo-async@^2.6.1: version "2.6.2" @@ -9562,9 +9585,9 @@ object-copy@^0.1.0: kind-of "^3.0.3" object-inspect@^1.9.0: - version "1.9.0" - resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz" - integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw== + version "1.12.2" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" + integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== object-inspect@~1.4.0: version "1.4.1" @@ -9652,10 +9675,10 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= +on-finished@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" + integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== dependencies: ee-first "1.1.1" @@ -10012,7 +10035,7 @@ parse5@6.0.1: parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" - resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== pascal-case@^3.1.2: @@ -10075,8 +10098,8 @@ path-parse@^1.0.6: path-to-regexp@0.1.7: version "0.1.7" - resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz" - integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== path-type@^2.0.0: version "2.0.0" @@ -11136,12 +11159,12 @@ protocol-buffers-schema@^3.3.1: resolved "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.5.1.tgz" integrity sha512-YVCvdhxWNDP8/nJDyXLuM+UFsuPk4+1PB7WGPVDzm3HTHbzFLxQYeW2iZpS4mmnXrQJGBzt230t/BbEb7PrQaw== -proxy-addr@~2.0.5: - version "2.0.6" - resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz" - integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== +proxy-addr@~2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== dependencies: - forwarded "~0.1.2" + forwarded "0.2.0" ipaddr.js "1.9.1" prr@~1.0.1: @@ -11226,10 +11249,12 @@ q@^1.1.2, q@^1.5.1: resolved "https://registry.npmjs.org/q/-/q-1.5.1.tgz" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= -qs@6.7.0: - version "6.7.0" - resolved "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz" - integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== +qs@6.11.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== + dependencies: + side-channel "^1.0.4" qs@~6.5.2: version "6.5.2" @@ -11312,16 +11337,16 @@ randomfill@^1.0.3: range-parser@^1.2.1, range-parser@~1.2.1: version "1.2.1" - resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.4.0: - version "2.4.0" - resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz" - integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== +raw-body@2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" + integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== dependencies: - bytes "3.1.0" - http-errors "1.7.2" + bytes "3.1.2" + http-errors "2.0.0" iconv-lite "0.4.24" unpipe "1.0.0" @@ -12098,7 +12123,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: +safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -12117,7 +12142,7 @@ safe-regex@^1.1.0: "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" - resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== safer-eval@^1.3.0: @@ -12260,24 +12285,24 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -send@0.17.1: - version "0.17.1" - resolved "https://registry.npmjs.org/send/-/send-0.17.1.tgz" - integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== +send@0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" + integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== dependencies: debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" + depd "2.0.0" + destroy "1.2.0" encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" fresh "0.5.2" - http-errors "~1.7.2" + http-errors "2.0.0" mime "1.6.0" - ms "2.1.1" - on-finished "~2.3.0" + ms "2.1.3" + on-finished "2.4.1" range-parser "~1.2.1" - statuses "~1.5.0" + statuses "2.0.1" serialize-javascript@^4.0.0: version "4.0.0" @@ -12314,15 +12339,15 @@ serve-index@^1.9.1: mime-types "~2.1.17" parseurl "~1.3.2" -serve-static@1.14.1, serve-static@^1.12.4: - version "1.14.1" - resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz" - integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== +serve-static@1.15.0, serve-static@^1.12.4: + version "1.15.0" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" + integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== dependencies: encodeurl "~1.0.2" escape-html "~1.0.3" parseurl "~1.3.3" - send "0.17.1" + send "0.18.0" set-blocking@^2.0.0: version "2.0.0" @@ -12349,10 +12374,10 @@ setprototypeof@1.1.0: resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz" integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== -setprototypeof@1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz" - integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== sha.js@^2.4.0, sha.js@^2.4.8: version "2.4.11" @@ -12410,7 +12435,7 @@ shellwords@^0.1.1: side-channel@^1.0.4: version "1.0.4" - resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== dependencies: call-bind "^1.0.0" @@ -12736,7 +12761,12 @@ static-module@^2.2.0: static-eval "^2.0.0" through2 "~2.0.3" -"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + +"statuses@>= 1.4.0 < 2": version "1.5.0" resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= @@ -13272,10 +13302,10 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" -toidentifier@1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz" - integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== tough-cookie@^2.3.3, tough-cookie@^2.5.0, tough-cookie@~2.5.0: version "2.5.0" @@ -13447,9 +13477,9 @@ type-fest@^0.8.1: resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== -type-is@~1.6.17, type-is@~1.6.18: +type-is@~1.6.18: version "1.6.18" - resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== dependencies: media-typer "0.3.0" @@ -13591,8 +13621,8 @@ universalify@^2.0.0: unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== unquote@~1.1.1: version "1.1.1" @@ -13698,8 +13728,8 @@ utila@~0.4: utils-merge@1.0.1: version "1.0.1" - resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== uuid@^3.3.2, uuid@^3.4.0: version "3.4.0" @@ -13735,8 +13765,8 @@ validate-npm-package-license@^3.0.1: vary@~1.1.2: version "1.1.2" - resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== vendors@^1.0.0: version "1.0.4" From 34ef190832040c8a0dacf68e305b43d04652800c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 8 Jan 2023 06:54:57 +0000 Subject: [PATCH 05/14] chore(deps): bump json5 from 1.0.1 to 1.0.2 Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index a96b8c0..34ea35f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8535,9 +8535,9 @@ json5@2.x, json5@^2.1.0, json5@^2.1.2: minimist "^1.2.5" json5@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + version "1.0.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" + integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== dependencies: minimist "^1.2.0" @@ -9216,9 +9216,9 @@ minimist-options@4.1.0: kind-of "^6.0.3" minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: - version "1.2.6" - resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz" - integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== minipass-collect@^1.0.2: version "1.0.2" From 9bc7a49b7369fc09ab7f116518af85b6fec2eb9b Mon Sep 17 00:00:00 2001 From: Scott Kang Date: Fri, 13 Jan 2023 17:06:02 +0800 Subject: [PATCH 06/14] chore: remove circleci config --- .circleci/config.yml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index f0bc9a2..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: 2.1 -orbs: - node: circleci/node@1.1.6 -jobs: - build-and-test: - executor: - name: node/default - tag: '12.21' - steps: - - checkout - - node/with-cache: - steps: - - run: yarn install - - run: yarn test - - run: yarn build -workflows: - build-and-test: - jobs: - - build-and-test From aa0f8b5cbb870d78c10c3ce88b084d2668852f66 Mon Sep 17 00:00:00 2001 From: Ronald van der Kooij Date: Sun, 12 Mar 2023 23:11:28 +0100 Subject: [PATCH 07/14] fix: using dist version of mapbox gl css --- src/components/AzureMap/AzureMap.tsx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/components/AzureMap/AzureMap.tsx b/src/components/AzureMap/AzureMap.tsx index a41e6f9..c296a58 100644 --- a/src/components/AzureMap/AzureMap.tsx +++ b/src/components/AzureMap/AzureMap.tsx @@ -4,7 +4,7 @@ import { IAzureMap, IAzureMapsContextProps, MapType } from '../../types' import { AzureMapsContext } from '../../contexts/AzureMapContext' import { Guid } from 'guid-typescript' import 'azure-maps-control/dist/atlas.min.css' -import 'mapbox-gl/src/css/mapbox-gl.css' +import 'mapbox-gl/dist/mapbox-gl.css' import { useCheckRef } from '../../hooks/useCheckRef' import { createImageSprites } from './useCreateSprites' import { createMapControls, createMapCustomControls } from './useCreateMapControls' @@ -27,9 +27,13 @@ const AzureMap = memo( styleOptions, serviceOptions }: IAzureMap) => { - const { setMapRef, removeMapRef, mapRef, setMapReady, isMapReady } = useContext< - IAzureMapsContextProps - >(AzureMapsContext) + const { + setMapRef, + removeMapRef, + mapRef, + setMapReady, + isMapReady + } = useContext(AzureMapsContext) const [mapId] = useState(providedMapId || Guid.create().toString()) useEffect(() => { if (mapRef) { @@ -61,7 +65,7 @@ const AzureMap = memo( } }, [serviceOptions]) - useCheckRef(mapRef, mapRef, mref => { + useCheckRef(mapRef, mapRef, (mref) => { mref.events.add('ready', () => { if (imageSprites) { createImageSprites(mref, imageSprites) From bcc1ead3730f4bb776d12ba9356c4c13eb0d6bfd Mon Sep 17 00:00:00 2001 From: Ronald van der Kooij Date: Sun, 12 Mar 2023 23:20:32 +0100 Subject: [PATCH 08/14] chore: undo formatting --- src/components/AzureMap/AzureMap.tsx | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/components/AzureMap/AzureMap.tsx b/src/components/AzureMap/AzureMap.tsx index c296a58..3d2756d 100644 --- a/src/components/AzureMap/AzureMap.tsx +++ b/src/components/AzureMap/AzureMap.tsx @@ -27,13 +27,9 @@ const AzureMap = memo( styleOptions, serviceOptions }: IAzureMap) => { - const { - setMapRef, - removeMapRef, - mapRef, - setMapReady, - isMapReady - } = useContext(AzureMapsContext) + const { setMapRef, removeMapRef, mapRef, setMapReady, isMapReady} = useContext< + IAzureMapsContextProps + >(AzureMapsContext) const [mapId] = useState(providedMapId || Guid.create().toString()) useEffect(() => { if (mapRef) { @@ -65,7 +61,7 @@ const AzureMap = memo( } }, [serviceOptions]) - useCheckRef(mapRef, mapRef, (mref) => { + useCheckRef(mapRef, mapRef, mref => { mref.events.add('ready', () => { if (imageSprites) { createImageSprites(mref, imageSprites) From 492445a6aba91ef28736738f56a74bb495529b0c Mon Sep 17 00:00:00 2001 From: Ronald van der Kooij Date: Sun, 12 Mar 2023 23:21:20 +0100 Subject: [PATCH 09/14] chore: undo formatting 2 --- src/components/AzureMap/AzureMap.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/AzureMap/AzureMap.tsx b/src/components/AzureMap/AzureMap.tsx index 3d2756d..19fcdb9 100644 --- a/src/components/AzureMap/AzureMap.tsx +++ b/src/components/AzureMap/AzureMap.tsx @@ -27,7 +27,7 @@ const AzureMap = memo( styleOptions, serviceOptions }: IAzureMap) => { - const { setMapRef, removeMapRef, mapRef, setMapReady, isMapReady} = useContext< + const { setMapRef, removeMapRef, mapRef, setMapReady, isMapReady } = useContext< IAzureMapsContextProps >(AzureMapsContext) const [mapId] = useState(providedMapId || Guid.create().toString()) From 117a12d414e98ddb7d87cf2b2e36c918df0c1cff Mon Sep 17 00:00:00 2001 From: Scott Kang Date: Thu, 16 Mar 2023 14:42:29 +0800 Subject: [PATCH 10/14] chore: bump version to 0.4.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b85e5ce..e48cafd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-azure-maps", - "version": "0.4.4", + "version": "0.4.5", "description": "React Wrapper for Azure Maps", "keywords": [ "react", From f39d0e7b4fafcd752ba9d73a6bb4046c93ae7ccf Mon Sep 17 00:00:00 2001 From: Lucas Levandoski Date: Wed, 29 Mar 2023 16:03:23 -0300 Subject: [PATCH 11/14] fixing authentication type export --- README.md | 3 +-- src/types.ts | 53 ++++++++++++++++++++++++++-------------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 87044ad..cbc8af8 100644 --- a/README.md +++ b/README.md @@ -68,8 +68,7 @@ The library implements a lot of ready to use components like `AzureMapFeature, A ```javascript import React from 'react' -import {AzureMap, AzureMapsProvider, IAzureMapOptions} from 'react-azure-maps' -import {AuthenticationType} from 'azure-maps-control' +import {AzureMap, AzureMapsProvider, IAzureMapOptions, AuthenticationType} from 'react-azure-maps' const option: IAzureMapOptions = { authOptions: { diff --git a/src/types.ts b/src/types.ts index 72f9f5d..5ac8642 100644 --- a/src/types.ts +++ b/src/types.ts @@ -161,28 +161,28 @@ export type IAzureMapEvent = { export type IAzureDataSourceStatefulProviderProps = { id: string children?: - | Array - | IAzureDataSourceChildren - | null + | Array + | IAzureDataSourceChildren + | null options?: DataSourceOptions events?: IAzureMapDataSourceEvent | any dataFromUrl?: string collection?: - | atlas.data.FeatureCollection - | atlas.data.Feature - | atlas.data.Geometry - | atlas.data.GeometryCollection - | Shape - | Array | atlas.data.Geometry | Shape> + | atlas.data.FeatureCollection + | atlas.data.Feature + | atlas.data.Geometry + | atlas.data.GeometryCollection + | Shape + | Array | atlas.data.Geometry | Shape> index?: number } export type IAzureVectorTileSourceStatefulProviderProps = { id: string children?: - | Array - | IAzureVectorTileSourceChildren - | null + | Array + | IAzureVectorTileSourceChildren + | null options?: VectorTileSourceOptions events?: IAzureMapVectorTileSourceEvent // NOTE: not sure yet why this is needed, haven't seen this used in AzureMapsDataSource, though IAzureGeoJSONDataSourceStatefulProviderProps has it @@ -202,16 +202,16 @@ export type IAzureMapLifecycleEvent = { export type IAzureLayerStatefulProviderProps = { id?: string options?: - | (SymbolLayerOptions & - HeatMapLayerOptions & - ImageLayerOptions & - LineLayerOptions & - PolygonExtrusionLayerOptions & - PolygonLayerOptions & - TileLayerOptions & - BubbleLayerOptions & - LayerOptions) - | Options + | (SymbolLayerOptions & + HeatMapLayerOptions & + ImageLayerOptions & + LineLayerOptions & + PolygonExtrusionLayerOptions & + PolygonLayerOptions & + TileLayerOptions & + BubbleLayerOptions & + LayerOptions) + | Options type: IAzureMapLayerType events?: IAzureMapLayerEvent | any onCreateCustomLayer?: (dataSourceRef: DataSourceType, mapRef: MapType | null) => atlas.layer.Layer @@ -316,10 +316,10 @@ export type IAzureMapFeature = { properties?: Options // Shape functions: setCoords?: - | atlas.data.Position - | atlas.data.Position[] - | atlas.data.Position[][] - | atlas.data.Position[][][] + | atlas.data.Position + | atlas.data.Position[] + | atlas.data.Position[][] + | atlas.data.Position[][][] setProperties?: Options } @@ -340,3 +340,4 @@ export type AzureDataLineString = atlas.data.LineString export type AzureDataPosition = atlas.data.Position export type ControlOptions = atlas.ControlOptions export type AzureSetCameraOptions = ((CameraOptions | CameraBoundsOptions) & AnimationOptions) | any +export { AuthenticationType } from 'azure-maps-control' \ No newline at end of file From 545d030b54dd0ac9e15206c93f75c6f6d0e1a344 Mon Sep 17 00:00:00 2001 From: Lucas Levandoski Date: Wed, 29 Mar 2023 16:07:25 -0300 Subject: [PATCH 12/14] fixing indentation --- src/types.ts | 470 +++++++++++++++++++++++++-------------------------- 1 file changed, 235 insertions(+), 235 deletions(-) diff --git a/src/types.ts b/src/types.ts index 5ac8642..e94b8b8 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,326 +1,326 @@ import { ComponentClass, CSSProperties, ReactElement, ReactNode, FunctionComponent } from 'react' import atlas, { - AnimationOptions, - CameraBoundsOptions, - CameraOptions, - DataSourceOptions, - HeatMapLayerOptions, - HtmlMarker, - HtmlMarkerEvents, - HtmlMarkerOptions, - ImageLayerOptions, - LineLayerOptions, - Map, - MapDataEvent, - MapErrorEvent, - MapEvent, - MapMouseEvent, - MapMouseWheelEvent, - MapTouchEvent, - Options, - PolygonExtrusionLayerOptions, - PolygonLayerOptions, - PopupEvents, - PopupOptions, - ServiceOptions, - Shape, - StyleOptions, - SymbolLayerOptions, - TargetedEvent, - TileLayerOptions, - TrafficOptions, - UserInteractionOptions, - Control, - BubbleLayerOptions, - LayerOptions, - VectorTileSourceOptions + AnimationOptions, + CameraBoundsOptions, + CameraOptions, + DataSourceOptions, + HeatMapLayerOptions, + HtmlMarker, + HtmlMarkerEvents, + HtmlMarkerOptions, + ImageLayerOptions, + LineLayerOptions, + Map, + MapDataEvent, + MapErrorEvent, + MapEvent, + MapMouseEvent, + MapMouseWheelEvent, + MapTouchEvent, + Options, + PolygonExtrusionLayerOptions, + PolygonLayerOptions, + PopupEvents, + PopupOptions, + ServiceOptions, + Shape, + StyleOptions, + SymbolLayerOptions, + TargetedEvent, + TileLayerOptions, + TrafficOptions, + UserInteractionOptions, + Control, + BubbleLayerOptions, + LayerOptions, + VectorTileSourceOptions } from 'azure-maps-control' export type IAzureMapOptions = ServiceOptions & - StyleOptions & - UserInteractionOptions & - (CameraOptions | CameraBoundsOptions) + StyleOptions & + UserInteractionOptions & + (CameraOptions | CameraBoundsOptions) export type IAzureMapChildren = - | ReactElement - | ReactElement - | ReactElement + | ReactElement + | ReactElement + | ReactElement export type IAzureMap = { - children?: Array | IAzureMapChildren - providedMapId?: string - containerClassName?: string - styles?: CSSProperties - LoaderComponent?: ComponentClass | FunctionComponent - options?: IAzureMapOptions - imageSprites?: IAzureMapImageSprite[] - controls?: IAzureMapControls[] - customControls?: IAzureCustomControls[] - events?: IAzureMapEvent | any - cameraOptions?: AzureSetCameraOptions - trafficOptions?: TrafficOptions - userInteraction?: UserInteractionOptions - styleOptions?: StyleOptions - serviceOptions?: ServiceOptions + children?: Array | IAzureMapChildren + providedMapId?: string + containerClassName?: string + styles?: CSSProperties + LoaderComponent?: ComponentClass | FunctionComponent + options?: IAzureMapOptions + imageSprites?: IAzureMapImageSprite[] + controls?: IAzureMapControls[] + customControls?: IAzureCustomControls[] + events?: IAzureMapEvent | any + cameraOptions?: AzureSetCameraOptions + trafficOptions?: TrafficOptions + userInteraction?: UserInteractionOptions + styleOptions?: StyleOptions + serviceOptions?: ServiceOptions } export type IAzureCustomControls = { - control: Control - controlOptions?: ControlOptions + control: Control + controlOptions?: ControlOptions } export type IAzureMapControls = { - controlName: string - controlOptions?: Options - options?: ControlOptions | undefined + controlName: string + controlOptions?: Options + options?: ControlOptions | undefined } export type IAzureMapImageSprite = { - id: string - templateName?: string - color?: string - secondaryColor?: string - scale?: number - icon?: string | HTMLImageElement | ImageData + id: string + templateName?: string + color?: string + secondaryColor?: string + scale?: number + icon?: string | HTMLImageElement | ImageData } export type IAzureMapContextState = { - mapRef: Map | null - isMapReady: boolean | false - setMapRef(mapRef: Map): void - removeMapRef(): void - setMapReady(isMapReady: boolean): void + mapRef: Map | null + isMapReady: boolean | false + setMapRef(mapRef: Map): void + removeMapRef(): void + setMapReady(isMapReady: boolean): void } export type IAzureMapHtmlMarkerEvent = { - eventName: keyof HtmlMarkerEvents - callback: (e: TargetedEvent) => void + eventName: keyof HtmlMarkerEvents + callback: (e: TargetedEvent) => void } export type IAzureMapPopupEvent = { - eventName: keyof PopupEvents - callback: (e: TargetedEvent) => void + eventName: keyof PopupEvents + callback: (e: TargetedEvent) => void } export type IAzureMapMouseEvents = { - [T in keyof HtmlMarkerEvents]: (e: TargetedEvent) => void + [T in keyof HtmlMarkerEvents]: (e: TargetedEvent) => void } export type IAzureMapHtmlMarker = { - id?: string - isPopupVisible?: boolean - markerContent?: ReactElement - options?: HtmlMarkerOptions - events?: Array + id?: string + isPopupVisible?: boolean + markerContent?: ReactElement + options?: HtmlMarkerOptions + events?: Array } export type IAzureMapPopup = { - isVisible?: boolean - options?: PopupOptions - events?: Array - popupContent: ReactElement + isVisible?: boolean + options?: PopupOptions + events?: Array + popupContent: ReactElement } export type IAzureMapDataSourceContextState = { - dataSourceRef: atlas.source.DataSource | atlas.source.VectorTileSource | null + dataSourceRef: atlas.source.DataSource | atlas.source.VectorTileSource | null } export type IAzureMapLayerContextState = { - layerRef: atlas.layer.SymbolLayer | atlas.layer.ImageLayer | atlas.layer.TileLayer | null + layerRef: atlas.layer.SymbolLayer | atlas.layer.ImageLayer | atlas.layer.TileLayer | null } export type IAzureDataSourceChildren = - | (IAzureMapFeature & ReactNode) - | ReactElement - | ReactElement + | (IAzureMapFeature & ReactNode) + | ReactElement + | ReactElement export type IAzureVectorTileSourceChildren = ReactElement export type IAzureMapDataSourceEvent = { - [property in IAzureMapDataSourceEventType]: (e: Shape[]) => void + [property in IAzureMapDataSourceEventType]: (e: Shape[]) => void } export type IAzureMapVectorTileSourceEvent = { - [property in IAzureMapSourceEventType]?: (e: atlas.source.VectorTileSource) => void + [property in IAzureMapSourceEventType]?: (e: atlas.source.VectorTileSource) => void } export type IAzureMapEvent = { - [property in IAzureMapEventsType]: ( - e: - | MapDataEvent - | MapErrorEvent - | MapTouchEvent - | MapMouseEvent - | string - | MapMouseWheelEvent - | MapEvent - | atlas.layer.Layer - | atlas.source.Source - ) => void + [property in IAzureMapEventsType]: ( + e: + | MapDataEvent + | MapErrorEvent + | MapTouchEvent + | MapMouseEvent + | string + | MapMouseWheelEvent + | MapEvent + | atlas.layer.Layer + | atlas.source.Source + ) => void } export type IAzureDataSourceStatefulProviderProps = { - id: string - children?: - | Array - | IAzureDataSourceChildren - | null - options?: DataSourceOptions - events?: IAzureMapDataSourceEvent | any - dataFromUrl?: string - collection?: - | atlas.data.FeatureCollection - | atlas.data.Feature - | atlas.data.Geometry - | atlas.data.GeometryCollection - | Shape - | Array | atlas.data.Geometry | Shape> - index?: number + id: string + children?: + | Array + | IAzureDataSourceChildren + | null + options?: DataSourceOptions + events?: IAzureMapDataSourceEvent | any + dataFromUrl?: string + collection?: + | atlas.data.FeatureCollection + | atlas.data.Feature + | atlas.data.Geometry + | atlas.data.GeometryCollection + | Shape + | Array | atlas.data.Geometry | Shape> + index?: number } export type IAzureVectorTileSourceStatefulProviderProps = { - id: string - children?: - | Array - | IAzureVectorTileSourceChildren - | null - options?: VectorTileSourceOptions - events?: IAzureMapVectorTileSourceEvent - // NOTE: not sure yet why this is needed, haven't seen this used in AzureMapsDataSource, though IAzureGeoJSONDataSourceStatefulProviderProps has it - index?: number + id: string + children?: + | Array + | IAzureVectorTileSourceChildren + | null + options?: VectorTileSourceOptions + events?: IAzureMapVectorTileSourceEvent + // NOTE: not sure yet why this is needed, haven't seen this used in AzureMapsDataSource, though IAzureGeoJSONDataSourceStatefulProviderProps has it + index?: number } export type IAzureMapLayerEvent = { - [property in IAzureMapLayerEventType]: ( - e: MapMouseEvent | MapTouchEvent | MapMouseWheelEvent - ) => void + [property in IAzureMapLayerEventType]: ( + e: MapMouseEvent | MapTouchEvent | MapMouseWheelEvent + ) => void } export type IAzureMapLifecycleEvent = { - [property in IAzureMapLayerLifecycleEvents]: (e: atlas.layer.Layer) => void + [property in IAzureMapLayerLifecycleEvents]: (e: atlas.layer.Layer) => void } export type IAzureLayerStatefulProviderProps = { - id?: string - options?: - | (SymbolLayerOptions & - HeatMapLayerOptions & - ImageLayerOptions & - LineLayerOptions & - PolygonExtrusionLayerOptions & - PolygonLayerOptions & - TileLayerOptions & - BubbleLayerOptions & - LayerOptions) - | Options - type: IAzureMapLayerType - events?: IAzureMapLayerEvent | any - onCreateCustomLayer?: (dataSourceRef: DataSourceType, mapRef: MapType | null) => atlas.layer.Layer - lifecycleEvents?: IAzureMapLifecycleEvent | any + id?: string + options?: + | (SymbolLayerOptions & + HeatMapLayerOptions & + ImageLayerOptions & + LineLayerOptions & + PolygonExtrusionLayerOptions & + PolygonLayerOptions & + TileLayerOptions & + BubbleLayerOptions & + LayerOptions) + | Options + type: IAzureMapLayerType + events?: IAzureMapLayerEvent | any + onCreateCustomLayer?: (dataSourceRef: DataSourceType, mapRef: MapType | null) => atlas.layer.Layer + lifecycleEvents?: IAzureMapLifecycleEvent | any } export type IAzureMapLayerLifecycleEvents = 'layeradded' | 'layerremoved' export type IAzureMapEventsType = - | IAzureMapLayerEventType - | IAzureMapLayerLifecycleEvents - | IAzureMapDataSourceEventType - | IAzureMapAddEventsType - | IAzureMapSourceEventType - // Adds a data event to the map. - | 'data' - | 'sourcedata' - | 'styledata' - // Adds an event to the map. - | 'error' - // Adds a style image missing event to the map. - | 'styleimagemissing' + | IAzureMapLayerEventType + | IAzureMapLayerLifecycleEvents + | IAzureMapDataSourceEventType + | IAzureMapAddEventsType + | IAzureMapSourceEventType + // Adds a data event to the map. + | 'data' + | 'sourcedata' + | 'styledata' + // Adds an event to the map. + | 'error' + // Adds a style image missing event to the map. + | 'styleimagemissing' export type IAzureMapAddEventsType = - | 'boxzoomstart' - | 'boxzoomend' - | 'dragstart' - | 'drag' - | 'dragend' - | 'idle' - | 'load' - | 'movestart' - | 'move' - | 'moveend' - | 'pitchstart' - | 'pitch' - | 'pitchend' - | 'ready' - | 'render' - | 'resize' - | 'rotatestart' - | 'rotate' - | 'rotateend' - | 'tokenacquired' - | 'zoomstart' - | 'zoom' - | 'zoomend' + | 'boxzoomstart' + | 'boxzoomend' + | 'dragstart' + | 'drag' + | 'dragend' + | 'idle' + | 'load' + | 'movestart' + | 'move' + | 'moveend' + | 'pitchstart' + | 'pitch' + | 'pitchend' + | 'ready' + | 'render' + | 'resize' + | 'rotatestart' + | 'rotate' + | 'rotateend' + | 'tokenacquired' + | 'zoomstart' + | 'zoom' + | 'zoomend' export type IAzureMapDataSourceEventType = 'dataadded' | 'dataremoved' export type IAzureMapSourceEventType = 'sourceadded' | 'sourceremoved' export type IAzureMapLayerEventType = - // Mouse events - | 'mousedown' - | 'mouseup' - | 'mouseover' - | 'mousemove' - | 'click' - | 'dblclick' - | 'mouseout' - | 'mouseenter' - | 'mouseleave' - | 'contextmenu' - // Wheel events - | 'wheel' - // Touch events - | 'touchstart' - | 'touchend' - | 'touchmove' - | 'touchcancel' + // Mouse events + | 'mousedown' + | 'mouseup' + | 'mouseover' + | 'mousemove' + | 'click' + | 'dblclick' + | 'mouseout' + | 'mouseenter' + | 'mouseleave' + | 'contextmenu' + // Wheel events + | 'wheel' + // Touch events + | 'touchstart' + | 'touchend' + | 'touchmove' + | 'touchcancel' export type IAzureMapLayerType = - | 'SymbolLayer' - | 'HeatLayer' - | 'ImageLayer' - | 'LineLayer' - | 'PolygonExtrusionLayer' - | 'PolygonLayer' - | 'TileLayer' - | 'BubbleLayer' - | 'HtmlMarkerLayer' - | 'custom' + | 'SymbolLayer' + | 'HeatLayer' + | 'ImageLayer' + | 'LineLayer' + | 'PolygonExtrusionLayer' + | 'PolygonLayer' + | 'TileLayer' + | 'BubbleLayer' + | 'HtmlMarkerLayer' + | 'custom' export type IAzureMapFeatureType = - | 'Point' - | 'MultiPoint' - | 'LineString' - | 'MultiLineString' - | 'Polygon' - | 'MultiPolygon' + | 'Point' + | 'MultiPoint' + | 'LineString' + | 'MultiLineString' + | 'Polygon' + | 'MultiPolygon' export type IAzureMapFeature = { - id?: string - type: IAzureMapFeatureType - coordinate?: atlas.data.Position - coordinates?: Array - multipleCoordinates?: Array> - multipleDimensionCoordinates?: Array>> - bbox?: atlas.data.BoundingBox - variant?: IAzureMapFeatureVariant - properties?: Options - // Shape functions: - setCoords?: - | atlas.data.Position - | atlas.data.Position[] - | atlas.data.Position[][] - | atlas.data.Position[][][] - setProperties?: Options + id?: string + type: IAzureMapFeatureType + coordinate?: atlas.data.Position + coordinates?: Array + multipleCoordinates?: Array> + multipleDimensionCoordinates?: Array>> + bbox?: atlas.data.BoundingBox + variant?: IAzureMapFeatureVariant + properties?: Options + // Shape functions: + setCoords?: + | atlas.data.Position + | atlas.data.Position[] + | atlas.data.Position[][] + | atlas.data.Position[][][] + setProperties?: Options } export type IAzureMapLayerProps = IAzureMapLayerContextState From d8601d4f22bc45b26ef8b4ceb91242df64267cd8 Mon Sep 17 00:00:00 2001 From: Lucas Levandoski <56331958+Lucas-Levandoski@users.noreply.github.com> Date: Wed, 29 Mar 2023 16:24:08 -0300 Subject: [PATCH 13/14] removing indentation eslint problems on my local machine --- src/types.ts | 472 +++++++++++++++++++++++++-------------------------- 1 file changed, 236 insertions(+), 236 deletions(-) diff --git a/src/types.ts b/src/types.ts index e94b8b8..b5e756e 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,326 +1,326 @@ import { ComponentClass, CSSProperties, ReactElement, ReactNode, FunctionComponent } from 'react' import atlas, { - AnimationOptions, - CameraBoundsOptions, - CameraOptions, - DataSourceOptions, - HeatMapLayerOptions, - HtmlMarker, - HtmlMarkerEvents, - HtmlMarkerOptions, - ImageLayerOptions, - LineLayerOptions, - Map, - MapDataEvent, - MapErrorEvent, - MapEvent, - MapMouseEvent, - MapMouseWheelEvent, - MapTouchEvent, - Options, - PolygonExtrusionLayerOptions, - PolygonLayerOptions, - PopupEvents, - PopupOptions, - ServiceOptions, - Shape, - StyleOptions, - SymbolLayerOptions, - TargetedEvent, - TileLayerOptions, - TrafficOptions, - UserInteractionOptions, - Control, - BubbleLayerOptions, - LayerOptions, - VectorTileSourceOptions + AnimationOptions, + CameraBoundsOptions, + CameraOptions, + DataSourceOptions, + HeatMapLayerOptions, + HtmlMarker, + HtmlMarkerEvents, + HtmlMarkerOptions, + ImageLayerOptions, + LineLayerOptions, + Map, + MapDataEvent, + MapErrorEvent, + MapEvent, + MapMouseEvent, + MapMouseWheelEvent, + MapTouchEvent, + Options, + PolygonExtrusionLayerOptions, + PolygonLayerOptions, + PopupEvents, + PopupOptions, + ServiceOptions, + Shape, + StyleOptions, + SymbolLayerOptions, + TargetedEvent, + TileLayerOptions, + TrafficOptions, + UserInteractionOptions, + Control, + BubbleLayerOptions, + LayerOptions, + VectorTileSourceOptions } from 'azure-maps-control' export type IAzureMapOptions = ServiceOptions & - StyleOptions & - UserInteractionOptions & - (CameraOptions | CameraBoundsOptions) + StyleOptions & + UserInteractionOptions & + (CameraOptions | CameraBoundsOptions) export type IAzureMapChildren = - | ReactElement - | ReactElement - | ReactElement + | ReactElement + | ReactElement + | ReactElement export type IAzureMap = { - children?: Array | IAzureMapChildren - providedMapId?: string - containerClassName?: string - styles?: CSSProperties - LoaderComponent?: ComponentClass | FunctionComponent - options?: IAzureMapOptions - imageSprites?: IAzureMapImageSprite[] - controls?: IAzureMapControls[] - customControls?: IAzureCustomControls[] - events?: IAzureMapEvent | any - cameraOptions?: AzureSetCameraOptions - trafficOptions?: TrafficOptions - userInteraction?: UserInteractionOptions - styleOptions?: StyleOptions - serviceOptions?: ServiceOptions + children?: Array | IAzureMapChildren + providedMapId?: string + containerClassName?: string + styles?: CSSProperties + LoaderComponent?: ComponentClass | FunctionComponent + options?: IAzureMapOptions + imageSprites?: IAzureMapImageSprite[] + controls?: IAzureMapControls[] + customControls?: IAzureCustomControls[] + events?: IAzureMapEvent | any + cameraOptions?: AzureSetCameraOptions + trafficOptions?: TrafficOptions + userInteraction?: UserInteractionOptions + styleOptions?: StyleOptions + serviceOptions?: ServiceOptions } export type IAzureCustomControls = { - control: Control - controlOptions?: ControlOptions + control: Control + controlOptions?: ControlOptions } export type IAzureMapControls = { - controlName: string - controlOptions?: Options - options?: ControlOptions | undefined + controlName: string + controlOptions?: Options + options?: ControlOptions | undefined } export type IAzureMapImageSprite = { - id: string - templateName?: string - color?: string - secondaryColor?: string - scale?: number - icon?: string | HTMLImageElement | ImageData + id: string + templateName?: string + color?: string + secondaryColor?: string + scale?: number + icon?: string | HTMLImageElement | ImageData } export type IAzureMapContextState = { - mapRef: Map | null - isMapReady: boolean | false - setMapRef(mapRef: Map): void - removeMapRef(): void - setMapReady(isMapReady: boolean): void + mapRef: Map | null + isMapReady: boolean | false + setMapRef(mapRef: Map): void + removeMapRef(): void + setMapReady(isMapReady: boolean): void } export type IAzureMapHtmlMarkerEvent = { - eventName: keyof HtmlMarkerEvents - callback: (e: TargetedEvent) => void + eventName: keyof HtmlMarkerEvents + callback: (e: TargetedEvent) => void } export type IAzureMapPopupEvent = { - eventName: keyof PopupEvents - callback: (e: TargetedEvent) => void + eventName: keyof PopupEvents + callback: (e: TargetedEvent) => void } export type IAzureMapMouseEvents = { - [T in keyof HtmlMarkerEvents]: (e: TargetedEvent) => void + [T in keyof HtmlMarkerEvents]: (e: TargetedEvent) => void } export type IAzureMapHtmlMarker = { - id?: string - isPopupVisible?: boolean - markerContent?: ReactElement - options?: HtmlMarkerOptions - events?: Array + id?: string + isPopupVisible?: boolean + markerContent?: ReactElement + options?: HtmlMarkerOptions + events?: Array } export type IAzureMapPopup = { - isVisible?: boolean - options?: PopupOptions - events?: Array - popupContent: ReactElement + isVisible?: boolean + options?: PopupOptions + events?: Array + popupContent: ReactElement } export type IAzureMapDataSourceContextState = { - dataSourceRef: atlas.source.DataSource | atlas.source.VectorTileSource | null + dataSourceRef: atlas.source.DataSource | atlas.source.VectorTileSource | null } export type IAzureMapLayerContextState = { - layerRef: atlas.layer.SymbolLayer | atlas.layer.ImageLayer | atlas.layer.TileLayer | null + layerRef: atlas.layer.SymbolLayer | atlas.layer.ImageLayer | atlas.layer.TileLayer | null } export type IAzureDataSourceChildren = - | (IAzureMapFeature & ReactNode) - | ReactElement - | ReactElement + | (IAzureMapFeature & ReactNode) + | ReactElement + | ReactElement export type IAzureVectorTileSourceChildren = ReactElement export type IAzureMapDataSourceEvent = { - [property in IAzureMapDataSourceEventType]: (e: Shape[]) => void + [property in IAzureMapDataSourceEventType]: (e: Shape[]) => void } export type IAzureMapVectorTileSourceEvent = { - [property in IAzureMapSourceEventType]?: (e: atlas.source.VectorTileSource) => void + [property in IAzureMapSourceEventType]?: (e: atlas.source.VectorTileSource) => void } export type IAzureMapEvent = { - [property in IAzureMapEventsType]: ( - e: - | MapDataEvent - | MapErrorEvent - | MapTouchEvent - | MapMouseEvent - | string - | MapMouseWheelEvent - | MapEvent - | atlas.layer.Layer - | atlas.source.Source - ) => void + [property in IAzureMapEventsType]: ( + e: + | MapDataEvent + | MapErrorEvent + | MapTouchEvent + | MapMouseEvent + | string + | MapMouseWheelEvent + | MapEvent + | atlas.layer.Layer + | atlas.source.Source + ) => void } export type IAzureDataSourceStatefulProviderProps = { - id: string - children?: - | Array - | IAzureDataSourceChildren - | null - options?: DataSourceOptions - events?: IAzureMapDataSourceEvent | any - dataFromUrl?: string - collection?: - | atlas.data.FeatureCollection - | atlas.data.Feature - | atlas.data.Geometry - | atlas.data.GeometryCollection - | Shape - | Array | atlas.data.Geometry | Shape> - index?: number + id: string + children?: + | Array + | IAzureDataSourceChildren + | null + options?: DataSourceOptions + events?: IAzureMapDataSourceEvent | any + dataFromUrl?: string + collection?: + | atlas.data.FeatureCollection + | atlas.data.Feature + | atlas.data.Geometry + | atlas.data.GeometryCollection + | Shape + | Array | atlas.data.Geometry | Shape> + index?: number } export type IAzureVectorTileSourceStatefulProviderProps = { - id: string - children?: - | Array - | IAzureVectorTileSourceChildren - | null - options?: VectorTileSourceOptions - events?: IAzureMapVectorTileSourceEvent - // NOTE: not sure yet why this is needed, haven't seen this used in AzureMapsDataSource, though IAzureGeoJSONDataSourceStatefulProviderProps has it - index?: number + id: string + children?: + | Array + | IAzureVectorTileSourceChildren + | null + options?: VectorTileSourceOptions + events?: IAzureMapVectorTileSourceEvent + // NOTE: not sure yet why this is needed, haven't seen this used in AzureMapsDataSource, though IAzureGeoJSONDataSourceStatefulProviderProps has it + index?: number } export type IAzureMapLayerEvent = { - [property in IAzureMapLayerEventType]: ( - e: MapMouseEvent | MapTouchEvent | MapMouseWheelEvent - ) => void + [property in IAzureMapLayerEventType]: ( + e: MapMouseEvent | MapTouchEvent | MapMouseWheelEvent + ) => void } export type IAzureMapLifecycleEvent = { - [property in IAzureMapLayerLifecycleEvents]: (e: atlas.layer.Layer) => void + [property in IAzureMapLayerLifecycleEvents]: (e: atlas.layer.Layer) => void } export type IAzureLayerStatefulProviderProps = { - id?: string - options?: - | (SymbolLayerOptions & - HeatMapLayerOptions & - ImageLayerOptions & - LineLayerOptions & - PolygonExtrusionLayerOptions & - PolygonLayerOptions & - TileLayerOptions & - BubbleLayerOptions & - LayerOptions) - | Options - type: IAzureMapLayerType - events?: IAzureMapLayerEvent | any - onCreateCustomLayer?: (dataSourceRef: DataSourceType, mapRef: MapType | null) => atlas.layer.Layer - lifecycleEvents?: IAzureMapLifecycleEvent | any + id?: string + options?: + | (SymbolLayerOptions & + HeatMapLayerOptions & + ImageLayerOptions & + LineLayerOptions & + PolygonExtrusionLayerOptions & + PolygonLayerOptions & + TileLayerOptions & + BubbleLayerOptions & + LayerOptions) + | Options + type: IAzureMapLayerType + events?: IAzureMapLayerEvent | any + onCreateCustomLayer?: (dataSourceRef: DataSourceType, mapRef: MapType | null) => atlas.layer.Layer + lifecycleEvents?: IAzureMapLifecycleEvent | any } export type IAzureMapLayerLifecycleEvents = 'layeradded' | 'layerremoved' export type IAzureMapEventsType = - | IAzureMapLayerEventType - | IAzureMapLayerLifecycleEvents - | IAzureMapDataSourceEventType - | IAzureMapAddEventsType - | IAzureMapSourceEventType - // Adds a data event to the map. - | 'data' - | 'sourcedata' - | 'styledata' - // Adds an event to the map. - | 'error' - // Adds a style image missing event to the map. - | 'styleimagemissing' + | IAzureMapLayerEventType + | IAzureMapLayerLifecycleEvents + | IAzureMapDataSourceEventType + | IAzureMapAddEventsType + | IAzureMapSourceEventType + // Adds a data event to the map. + | 'data' + | 'sourcedata' + | 'styledata' + // Adds an event to the map. + | 'error' + // Adds a style image missing event to the map. + | 'styleimagemissing' export type IAzureMapAddEventsType = - | 'boxzoomstart' - | 'boxzoomend' - | 'dragstart' - | 'drag' - | 'dragend' - | 'idle' - | 'load' - | 'movestart' - | 'move' - | 'moveend' - | 'pitchstart' - | 'pitch' - | 'pitchend' - | 'ready' - | 'render' - | 'resize' - | 'rotatestart' - | 'rotate' - | 'rotateend' - | 'tokenacquired' - | 'zoomstart' - | 'zoom' - | 'zoomend' + | 'boxzoomstart' + | 'boxzoomend' + | 'dragstart' + | 'drag' + | 'dragend' + | 'idle' + | 'load' + | 'movestart' + | 'move' + | 'moveend' + | 'pitchstart' + | 'pitch' + | 'pitchend' + | 'ready' + | 'render' + | 'resize' + | 'rotatestart' + | 'rotate' + | 'rotateend' + | 'tokenacquired' + | 'zoomstart' + | 'zoom' + | 'zoomend' export type IAzureMapDataSourceEventType = 'dataadded' | 'dataremoved' export type IAzureMapSourceEventType = 'sourceadded' | 'sourceremoved' export type IAzureMapLayerEventType = - // Mouse events - | 'mousedown' - | 'mouseup' - | 'mouseover' - | 'mousemove' - | 'click' - | 'dblclick' - | 'mouseout' - | 'mouseenter' - | 'mouseleave' - | 'contextmenu' - // Wheel events - | 'wheel' - // Touch events - | 'touchstart' - | 'touchend' - | 'touchmove' - | 'touchcancel' + // Mouse events + | 'mousedown' + | 'mouseup' + | 'mouseover' + | 'mousemove' + | 'click' + | 'dblclick' + | 'mouseout' + | 'mouseenter' + | 'mouseleave' + | 'contextmenu' + // Wheel events + | 'wheel' + // Touch events + | 'touchstart' + | 'touchend' + | 'touchmove' + | 'touchcancel' export type IAzureMapLayerType = - | 'SymbolLayer' - | 'HeatLayer' - | 'ImageLayer' - | 'LineLayer' - | 'PolygonExtrusionLayer' - | 'PolygonLayer' - | 'TileLayer' - | 'BubbleLayer' - | 'HtmlMarkerLayer' - | 'custom' + | 'SymbolLayer' + | 'HeatLayer' + | 'ImageLayer' + | 'LineLayer' + | 'PolygonExtrusionLayer' + | 'PolygonLayer' + | 'TileLayer' + | 'BubbleLayer' + | 'HtmlMarkerLayer' + | 'custom' export type IAzureMapFeatureType = - | 'Point' - | 'MultiPoint' - | 'LineString' - | 'MultiLineString' - | 'Polygon' - | 'MultiPolygon' + | 'Point' + | 'MultiPoint' + | 'LineString' + | 'MultiLineString' + | 'Polygon' + | 'MultiPolygon' export type IAzureMapFeature = { - id?: string - type: IAzureMapFeatureType - coordinate?: atlas.data.Position - coordinates?: Array - multipleCoordinates?: Array> - multipleDimensionCoordinates?: Array>> - bbox?: atlas.data.BoundingBox - variant?: IAzureMapFeatureVariant - properties?: Options - // Shape functions: - setCoords?: - | atlas.data.Position - | atlas.data.Position[] - | atlas.data.Position[][] - | atlas.data.Position[][][] - setProperties?: Options + id?: string + type: IAzureMapFeatureType + coordinate?: atlas.data.Position + coordinates?: Array + multipleCoordinates?: Array> + multipleDimensionCoordinates?: Array>> + bbox?: atlas.data.BoundingBox + variant?: IAzureMapFeatureVariant + properties?: Options + // Shape functions: + setCoords?: + | atlas.data.Position + | atlas.data.Position[] + | atlas.data.Position[][] + | atlas.data.Position[][][] + setProperties?: Options } export type IAzureMapLayerProps = IAzureMapLayerContextState @@ -340,4 +340,4 @@ export type AzureDataLineString = atlas.data.LineString export type AzureDataPosition = atlas.data.Position export type ControlOptions = atlas.ControlOptions export type AzureSetCameraOptions = ((CameraOptions | CameraBoundsOptions) & AnimationOptions) | any -export { AuthenticationType } from 'azure-maps-control' \ No newline at end of file +export { AuthenticationType } from 'azure-maps-control' From d847329c827ffaba1c735e3d6d5bd5ee7a8e8330 Mon Sep 17 00:00:00 2001 From: Scott Kang Date: Tue, 25 Apr 2023 17:21:02 +0800 Subject: [PATCH 14/14] chore: upgrade azure-maps-control to v3 --- README.md | 1 + package.json | 6 ++-- .../AzureMap/useCreateMapControls.tsx | 7 ++-- yarn.lock | 32 ++++++++++--------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 10575b3..97998d1 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ Generated documentation from typedoc is available [Documentation](https://azure. ## Compatibility with azure-maps-controls ``` +1.0.0 - 3.0.0 0.2.0 - 2.0.32 0.1.4 - 2.0.31 0.1.3 - 2.0.25 diff --git a/package.json b/package.json index 6654ea6..c26fd63 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-azure-maps", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.1", "description": "React Wrapper for Azure Maps", "keywords": [ "react", @@ -118,13 +118,13 @@ "typescript": "^4.1.2" }, "peerDependencies": { - "azure-maps-control": "2.0.32", + "azure-maps-control": "^3.0.0-preview.6", "guid-typescript": "^1.0.9", "react": "^17.0.2 || ^18.0.0", "react-dom": "^17.0.2 || ^18.0.0" }, "dependencies": { - "azure-maps-control": "2.0.32", + "azure-maps-control": "^3.0.0-preview.6", "guid-typescript": "^1.0.9" } } diff --git a/src/components/AzureMap/useCreateMapControls.tsx b/src/components/AzureMap/useCreateMapControls.tsx index 832f2c8..1ec5792 100644 --- a/src/components/AzureMap/useCreateMapControls.tsx +++ b/src/components/AzureMap/useCreateMapControls.tsx @@ -8,13 +8,11 @@ import atlas, { ZoomControlOptions } from 'azure-maps-control' - - export const createMapControls = (mapRef: MapType, controls: IAzureMapControls[]) => { controls.forEach((control: IAzureMapControls) => { const { controlName, options, controlOptions } = control mapRef.controls.add( - createControl(controlName, controlOptions) as atlas.ControlBase, + createControl(controlName, controlOptions) as atlas.control.ControlBase, options as ControlOptions ) }) @@ -23,7 +21,7 @@ export const createMapControls = (mapRef: MapType, controls: IAzureMapControls[] export const createControl = ( type: string, options?: ControlOptions -): atlas.ControlBase | undefined => { +): atlas.control.ControlBase | undefined => { switch (type) { case 'CompassControl': return new atlas.control.CompassControl(options as CompassControlOptions) @@ -50,4 +48,3 @@ export const createMapCustomControls = ( mapRef.controls.add(control, controlOptions) }) } - diff --git a/yarn.lock b/yarn.lock index 6c037b0..5b8740b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,18 @@ # yarn lockfile v1 +"@azure/msal-browser@^2.32.1": + version "2.36.0" + resolved "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.36.0.tgz#a95af979da1dd8572b6b3cb9fc86d51713d8ad91" + integrity sha512-OrVDZ9ftO7ExqZVHripAt+doKg6G14YbP2LoSygiWQoSqoO4CejoXLRLqANc/HGg18N0p/oaRETw4IHZvwsxZw== + dependencies: + "@azure/msal-common" "^12.1.0" + +"@azure/msal-common@^12.1.0": + version "12.1.0" + resolved "https://registry.npmjs.org/@azure/msal-common/-/msal-common-12.1.0.tgz#e253a4912a359193c52c570a1e2585cfd0213bff" + integrity sha512-9RUiv0evSHvYtvF7r9ksShw9FgCeT6Rf6JB/SOMbMzI0VySZDUBSE+0b9e7DgL2Ph8wSARIh3m8c5pCK9TRY3w== + "@babel/code-frame@7.10.4": version "7.10.4" resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz" @@ -2094,11 +2106,6 @@ dependencies: "@babel/runtime" "^7.12.5" -"@types/adal-angular@^1.0.1": - version "1.0.1" - resolved "https://registry.npmjs.org/@types/adal-angular/-/adal-angular-1.0.1.tgz" - integrity sha512-2sRGxJYrluhvIz8ae98i5k5woe9Fics4dMFHTcNfY2xAkj5QGZor+sfZzlgM58Fpw7Kklau9Gn6OhgJP25dKug== - "@types/anymatch@*": version "1.3.1" resolved "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz" @@ -3096,12 +3103,12 @@ axobject-query@^2.2.0: resolved "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz" integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA== -azure-maps-control@2.0.32: - version "2.0.32" - resolved "https://registry.npmjs.org/azure-maps-control/-/azure-maps-control-2.0.32.tgz" - integrity sha512-MgesL97292XIFNWVo/7koVpxGYW9g5AJx5XlJCXpg0teYUPrz+YsMUnyvNOQviHO3stvsBtQpEGT5gdwVibVIA== +azure-maps-control@^3.0.0-preview.6: + version "3.0.0-preview.6" + resolved "https://registry.yarnpkg.com/azure-maps-control/-/azure-maps-control-3.0.0-preview.6.tgz#e10591cfe7845f195b8884df210e96ca80b8d34c" + integrity sha512-+iQhVzdalQrXqFcUi3sSP2qD/Hj1ilg29/V1ajGqN3QzGjwgUr9yCNcr4VHdbXGnYJ2+thHk/TUlmXV8F09u0Q== dependencies: - "@types/adal-angular" "^1.0.1" + "@azure/msal-browser" "^2.32.1" babel-code-frame@^6.26.0: version "6.26.0" @@ -11017,11 +11024,6 @@ proto-list@~1.2.1: resolved "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz" integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= -protocol-buffers-schema@^3.3.1: - version "3.5.1" - resolved "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.5.1.tgz" - integrity sha512-YVCvdhxWNDP8/nJDyXLuM+UFsuPk4+1PB7WGPVDzm3HTHbzFLxQYeW2iZpS4mmnXrQJGBzt230t/BbEb7PrQaw== - proxy-addr@~2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"