Skip to content

Commit

Permalink
Fix gulp-gh-pages by bumping sub-dependency
Browse files Browse the repository at this point in the history
gift 0.6.x required by gulp-gh-pages is broken:

shinnn/gulp-gh-pages#117

Setting resolutions in package.json will cause yarn to show  warning
about conflicts, but will correctly install the requested version.
  • Loading branch information
sfentress committed Mar 9, 2018
1 parent 7976f15 commit e5c145e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
"react-dom": "^15.4.1",
"svg-social-icons": "^1.1.0"
},
"resolutions": {
"gift": "0.10.2"
},
"devDependencies": {
"beepbeep": "^1.2.0",
"browserify": "^13.0.0",
Expand Down
15 changes: 10 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -860,6 +860,10 @@ flagged-respawn@^0.3.2:
version "0.3.2"
resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5"

flex-exec@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/flex-exec/-/flex-exec-1.0.0.tgz#06974b68532839d2a12c32debcdb12378200fdf0"

for-in@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
Expand Down Expand Up @@ -917,11 +921,12 @@ gh-pages@^0.5.0:
q-io "~1.11.0"
wrench "1.5.1"

gift@^0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/gift/-/gift-0.6.1.tgz#c1698e6b6887164ed978a01095423cff65b8e79f"
gift@0.10.2, gift@^0.6.1:
version "0.10.2"
resolved "https://registry.yarnpkg.com/gift/-/gift-0.10.2.tgz#4600efe8f284b51fcb01c3527b321e22b494e156"
dependencies:
underscore "1.x.x"
flex-exec "^1.0.0"
underscore "^1.8.3"

glob-base@^0.3.0:
version "0.3.0"
Expand Down Expand Up @@ -2792,7 +2797,7 @@ unc-path-regex@^0.1.0:
version "0.1.2"
resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"

underscore@1.x.x:
underscore@^1.8.3:
version "1.8.3"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"

Expand Down

0 comments on commit e5c145e

Please sign in to comment.