From: Tom Hughes <tom@compton.nu>
Date: Sun, 21 May 2023 17:32:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4037'
X-Git-Tag: live~1205
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/2c890b41289b507d5737a2dbd97f7ffd4e99ff6d?hp=-c

Merge remote-tracking branch 'upstream/pull/4037'
---

2c890b41289b507d5737a2dbd97f7ffd4e99ff6d
diff --combined yarn.lock
index b0c47bdc8,181e528bb..fc989d741
--- a/yarn.lock
+++ b/yarn.lock
@@@ -29,10 -29,10 +29,10 @@@
      minimatch "^3.1.2"
      strip-json-comments "^3.1.1"
  
- "@eslint/js@8.40.0":
-   version "8.40.0"
-   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.40.0.tgz#3ba73359e11f5a7bd3e407f70b3528abfae69cec"
-   integrity sha512-ElyB54bJIhXQYVKjDSvCkPO1iU1tSAeVQJbllWJq1XQSmmA4dgFk8CbiBGpiOPxleE48vDogxCtmMYku4HSVLA==
+ "@eslint/js@8.41.0":
+   version "8.41.0"
+   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.41.0.tgz#080321c3b68253522f7646b55b577dd99d2950b3"
+   integrity sha512-LxcyMGxwmTh2lY9FwHPGWOHmYFCZvbrFCBZL4FzSSsxsRPuhrYUg/49/0KDfW8tnIEaEHtfmn6+NPN+1DqaNmA==
  
  "@humanwhocodes/config-array@^0.11.8":
    version "0.11.8"
@@@ -219,14 -219,14 +219,14 @@@ eslint-visitor-keys@^3.3.0, eslint-visi
    integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
  
  eslint@^8.0.0:
-   version "8.40.0"
-   resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.40.0.tgz#a564cd0099f38542c4e9a2f630fa45bf33bc42a4"
-   integrity sha512-bvR+TsP9EHL3TqNtj9sCNJVAFK3fBN8Q7g5waghxyRsPLIMwL73XSKnZFK0hk/O2ANC+iAoq6PWMQ+IfBAJIiQ==
+   version "8.41.0"
+   resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.41.0.tgz#3062ca73363b4714b16dbc1e60f035e6134b6f1c"
+   integrity sha512-WQDQpzGBOP5IrXPo4Hc0814r4/v2rrIsB0rhT7jtunIalgg6gYXWhRMOejVO8yH21T/FGaxjmFjBMNqcIlmH1Q==
    dependencies:
      "@eslint-community/eslint-utils" "^4.2.0"
      "@eslint-community/regexpp" "^4.4.0"
      "@eslint/eslintrc" "^2.0.3"
-     "@eslint/js" "8.40.0"
+     "@eslint/js" "8.41.0"
      "@humanwhocodes/config-array" "^0.11.8"
      "@humanwhocodes/module-importer" "^1.0.1"
      "@nodelib/fs.walk" "^1.2.8"
@@@ -246,13 -246,12 +246,12 @@@
      find-up "^5.0.0"
      glob-parent "^6.0.2"
      globals "^13.19.0"
-     grapheme-splitter "^1.0.4"
+     graphemer "^1.4.0"
      ignore "^5.2.0"
      import-fresh "^3.0.0"
      imurmurhash "^0.1.4"
      is-glob "^4.0.0"
      is-path-inside "^3.0.3"
-     js-sdsl "^4.1.4"
      js-yaml "^4.1.0"
      json-stable-stringify-without-jsonify "^1.0.1"
      levn "^0.4.1"
@@@ -392,10 -391,10 +391,10 @@@ globals@^13.19.0
    dependencies:
      type-fest "^0.20.2"
  
- grapheme-splitter@^1.0.4:
-   version "1.0.4"
-   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
-   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+ graphemer@^1.4.0:
+   version "1.4.0"
+   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+   integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
  
  has-flag@^4.0.0:
    version "4.0.0"
@@@ -477,11 -476,6 +476,6 @@@ js-cookie@^3.0.0
    resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.5.tgz#0b7e2fd0c01552c58ba86e0841f94dc2557dcdbc"
    integrity sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==
  
- js-sdsl@^4.1.4:
-   version "4.2.0"
-   resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz#278e98b7bea589b8baaf048c20aeb19eb7ad09d0"
-   integrity sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==
- 
  js-yaml@^4.1.0:
    version "4.1.0"
    resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
@@@ -505,9 -499,9 +499,9 @@@ leaflet.locatecontrol@^0.79.0
    integrity sha512-h64QIHFkypYdr90lkSfjKvPvvk8/b8UnP3m9WuoWdp5p2AaCWC0T1NVwyuj4rd5U4fBW3tQt4ppmZ2LceHMIDg==
  
  leaflet@^1.8.0:
 -  version "1.9.3"
 -  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414"
 -  integrity sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ==
 +  version "1.9.4"
 +  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d"
 +  integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
  
  levn@^0.4.1:
    version "0.4.1"