Skip to content

Commit

Permalink
Upgrade @types/webpack-env and @types/node to fix conflicting t… (#9365)
Browse files Browse the repository at this point in the history
Upgrade @types/webpack-env and @types/node to fix conflicting types
  • Loading branch information
ndelangen authored Jan 9, 2020
2 parents 29b6928 + ad548e9 commit 3115eef
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
4 changes: 2 additions & 2 deletions app/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down
12 changes: 11 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

1 comment on commit 3115eef

@vercel
Copy link

@vercel vercel bot commented on 3115eef Jan 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.