From: Tom Hughes <tom@compton.nu>
Date: Tue, 16 Mar 2021 11:07:47 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3133'
X-Git-Tag: live~1775
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e04ddc3e1538b708140440708d2d1d3c5cb56154?hp=-c

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

e04ddc3e1538b708140440708d2d1d3c5cb56154
diff --combined yarn.lock
index 9f8f4d929,557b4de8c..7e7f55779
--- a/yarn.lock
+++ b/yarn.lock
@@@ -247,9 -247,9 +247,9 @@@ eslint-visitor-keys@^2.0.0
    integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
  
  eslint@^7.3.1:
-   version "7.21.0"
-   resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz#4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83"
-   integrity sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg==
+   version "7.22.0"
+   resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.22.0.tgz#07ecc61052fec63661a2cab6bd507127c07adc6f"
+   integrity sha512-3VawOtjSJUQiiqac8MQc+w457iGLfuNGLFn8JmF051tTKbh5/x/0vlcEj8OgDCaw7Ysa2Jn8paGshV7x2abKXg==
    dependencies:
      "@babel/code-frame" "7.12.11"
      "@eslint/eslintrc" "^0.4.0"
@@@ -268,7 -268,7 +268,7 @@@
      file-entry-cache "^6.0.1"
      functional-red-black-tree "^1.0.1"
      glob-parent "^5.0.0"
-     globals "^12.1.0"
+     globals "^13.6.0"
      ignore "^4.0.6"
      import-fresh "^3.0.0"
      imurmurhash "^0.1.4"
@@@ -276,7 -276,7 +276,7 @@@
      js-yaml "^3.13.1"
      json-stable-stringify-without-jsonify "^1.0.1"
      levn "^0.4.1"
-     lodash "^4.17.20"
+     lodash "^4.17.21"
      minimatch "^3.0.4"
      natural-compare "^1.4.0"
      optionator "^0.9.1"
@@@ -408,6 -408,13 +408,13 @@@ globals@^12.1.0
    dependencies:
      type-fest "^0.8.1"
  
+ globals@^13.6.0:
+   version "13.6.0"
+   resolved "https://registry.yarnpkg.com/globals/-/globals-13.6.0.tgz#d77138e53738567bb96a3916ff6f6b487af20ef7"
+   integrity sha512-YFKCX0SiPg7l5oKYCJ2zZGxcXprVXHcSnVuvzrT3oSENQonVLqM5pf9fN5dLGZGyCjhw8TN8Btwe/jKnZ0pjvQ==
+   dependencies:
+     type-fest "^0.20.2"
+ 
  has-flag@^3.0.0:
    version "3.0.0"
    resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@@ -514,10 -521,10 +521,10 @@@ json-stable-stringify-without-jsonify@^
    resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
    integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
  
 -leaflet.locatecontrol@^0.72.0:
 -  version "0.72.2"
 -  resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.72.2.tgz#513787f983bce029c100a79aedc9eb98383100e0"
 -  integrity sha512-MNi7m+TlQFwiz5jq5W9vcGjwBHsh1PGxjKjONYd0NezuSLdj9dNjRsupLXtF2fNnX+s+tPNzP7V+Nmg6TKvhHA==
 +leaflet.locatecontrol@^0.73.0:
 +  version "0.73.0"
 +  resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.73.0.tgz#768d9edb0470f86c913ea6c2a70ec62380fd45c5"
 +  integrity sha512-e6v6SyDU2nzG5AiH80eH7qhXw5J+EfgmEFHkuzTRC9jqCSbfAm/3HlZDuoa9WYsaZbn5ovvqNeaLW/JSMsgg5g==
  
  leaflet@^1.6.0:
    version "1.7.1"
@@@ -532,10 -539,10 +539,10 @@@ levn@^0.4.1
      prelude-ls "^1.2.1"
      type-check "~0.4.0"
  
- lodash@^4.17.20:
-   version "4.17.20"
-   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
-   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+ lodash@^4.17.20, lodash@^4.17.21:
+   version "4.17.21"
+   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
  
  minimatch@^3.0.4:
    version "3.0.4"
@@@ -723,6 -730,11 +730,11 @@@ type-check@^0.4.0, type-check@~0.4.0
    dependencies:
      prelude-ls "^1.2.1"
  
+ type-fest@^0.20.2:
+   version "0.20.2"
+   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+ 
  type-fest@^0.8.1:
    version "0.8.1"
    resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"