From ad548e930ca0680cea8104539e00190bff25ca3f Mon Sep 17 00:00:00 2001
From: shisama <shisama07@gmail.com>
Date: Thu, 9 Jan 2020 19:33:03 +0900
Subject: [PATCH] Upgrade @types/webpack-env and @types/node to fix conflicting
 types

---
 app/react/package.json |  4 ++--
 yarn.lock              | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/react/package.json b/app/react/package.json
index 36fdabf40315..394daa9fe62a 100644
--- a/app/react/package.json
+++ b/app/react/package.json
@@ -40,7 +40,7 @@
     "@storybook/core": "5.3.0-rc.12",
     "@storybook/node-logger": "5.3.0-rc.12",
     "@svgr/webpack": "^4.0.3",
-    "@types/webpack-env": "^1.13.7",
+    "@types/webpack-env": "^1.15.0",
     "babel-plugin-add-react-displayname": "^0.0.5",
     "babel-plugin-named-asset-import": "^0.3.1",
     "babel-plugin-react-docgen": "^4.0.0",
@@ -57,7 +57,7 @@
   },
   "devDependencies": {
     "@types/mini-css-extract-plugin": "^0.8.0",
-    "@types/node": "^12.12.11",
+    "@types/node": "^13.1.5",
     "@types/webpack": "^4.41.0"
   },
   "peerDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 9b3d93a348c9..1f9fd747af64 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4152,6 +4152,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.6.tgz#a47240c10d86a9a57bb0c633f0b2e0aea9ce9253"
   integrity sha512-FjsYUPzEJdGXjwKqSpE0/9QEh6kzhTAeObA54rn6j3rR4C/mzpI9L0KNfoeASSPMMdxIsoJuCLDWcM/rVjIsSA==
 
+"@types/node@^13.1.5":
+  version "13.1.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.1.5.tgz#4d5efc52a1d3e45d13e5ec9f911cbc5b089ccaec"
+  integrity sha512-wupvfmtbqRJzjCm1H2diy7wo31Gn1OzvqoxCfQuKM9eSecogzP0WTlrjdq7cf7jgSO2ZX6hxwgRPR8Wt7FA22g==
+
 "@types/node@^6.0.0":
   version "6.14.9"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.9.tgz#733583e21ef0eab85a9737dfafbaa66345a92ef0"
@@ -4403,11 +4408,16 @@
   dependencies:
     "@types/node" "*"
 
-"@types/webpack-env@^1.13.7", "@types/webpack-env@^1.13.9", "@types/webpack-env@^1.14.0":
+"@types/webpack-env@^1.13.9", "@types/webpack-env@^1.14.0":
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.14.1.tgz#0d8a53f308f017c53a5ddc3d07f4d6fa76b790d7"
   integrity sha512-0Ki9jAAhKDSuLDXOIMADg54Hu60SuBTEsWaJGGy5cV+SSUQ63J2a+RrYYGrErzz39fXzTibhKrAQJAb8M7PNcA==
 
+"@types/webpack-env@^1.15.0":
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.15.0.tgz#bd9956d5044b1fb43e869a9ba9148862ff98d9fd"
+  integrity sha512-TfcyNecCz8Z9/s90gBOBniyzZrTru8u2Vp0VZODq4KEBaQu8bfXvu7o/KUOecMpzjbFPUA7aqgSq628Iue5BQg==
+
 "@types/webpack-sources@*", "@types/webpack-sources@^0.1.5":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.5.tgz#be47c10f783d3d6efe1471ff7f042611bd464a92"