Merge cockroachdb#51684

51684: ui: update lodash to 4.17.19 r=koorosh a=nathanstilwell Resolve dependabot alerts about lodash Release note: None Co-authored-by: Nathan Stilwell <[email protected]>
irfansharif · Jul 24, 2020 · 2207177 · 2207177
2 parents 6c4190d + b68c716
commit 2207177
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/pkg/ui/opt/package.json b/pkg/ui/opt/package.json
@@ -5,5 +5,9 @@
     "cypress": "^4.7.0",
     "cypress-image-snapshot": "^3.1.1",
     "webpack-dashboard": "^3.2.0"
+  },
+  "resolutions": {
+    "**/lodash": "^4.17.19"
   }
+
 }
diff --git a/pkg/ui/opt/yarn.lock b/pkg/ui/opt/yarn.lock
@@ -1156,10 +1156,10 @@ lodash.once@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
   integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
 
-[email protected], lodash@^4.17.4:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+[email protected], lodash@^4.17.19, lodash@^4.17.4:
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
+  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
 
 [email protected]:
   version "3.0.0"

diff --git a/pkg/ui/package.json b/pkg/ui/package.json
@@ -21,7 +21,7 @@
     "connected-react-router": "^6.6.1",
     "create-react-context": "^0.3.0",
     "highlight.js": "^9.10.0",
-    "lodash": "^4.17.4",
+    "lodash": "^4.17.19",
     "long": "^4.0.0",
     "mini-create-react-context": "^0.3.2",
     "moment": "^2.19.3",
@@ -137,7 +137,6 @@
     "**/chokidar": "^2.0.0",
     "**/deep-extend": "^0.5.1",
     "**/extend": "^3.0.2",
-    "**/lodash": "4.17.15",
     "**/react-dom": "^16.12.0",
     "**/ua-parser-js": "0.7.20",
     "**/url-parse": "^1.4.3"

diff --git a/pkg/ui/yarn-vendor b/pkg/ui/yarn-vendor
diff --git a/pkg/ui/yarn.lock b/pkg/ui/yarn.lock
@@ -8096,11 +8096,16 @@ lodash.throttle@^4.0.0, lodash.throttle@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
   integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
 
-lodash@4.17.15, lodash@^4.0.0, lodash@^4.15.0, lodash@^4.16.5, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5:
+lodash@^4.0.0, lodash@^4.15.0, lodash@^4.16.5, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
+lodash@^4.17.19, lodash@^4.17.4:
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
+  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
+
 [email protected]:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"