Skip to content

Commit

Permalink
[fixed] lerna bootstrap
Browse files Browse the repository at this point in the history
Summary:
Running lerna inadvertently pushed the [lerna upgrade commit](ae8bbc0), which broke CI.

This commit pins `pundle-dev` to a fork that bumps the broken dependency.  It also makes the `sinon` peer dependency of `testing-utils` match the hoisted version, which should suppress a warning.

Reviewers: O2 Material Motion, #material_motion

Tags: #material_motion

Differential Revision: http://codereview.cc/D3485
  • Loading branch information
appsforartists committed Nov 29, 2018
1 parent 73cbeca commit a6ea0bb
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"packages/*"
],
"resolutions": {
"uws": "10.148.2"
"pundle-dev": "material-motion/pundle-dev"
},
"devDependencies": {
"@bazel/typescript": "^0.2.2",
Expand All @@ -40,7 +40,7 @@
"pundle-api": "2.0.0-beta12",
"pundle-browser": "2.0.0-beta12",
"pundle-cli": "2.0.0-beta12",
"pundle-dev": "2.0.0-beta12",
"pundle-dev": "material-motion/pundle-dev",
"pundle-fs": "2.0.0-beta12",
"pundle-generator-default": "2.0.0-beta12",
"pundle-loader-js": "2.0.0-beta12",
Expand Down
2 changes: 1 addition & 1 deletion packages/testing-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"peerDependencies": {
"indefinite-observable": "^1.0.0",
"mocha-sugar-free": "1.3.1",
"sinon": "2.0.0-pre.3"
"sinon": "7.1.1"
},
"repository": {
"type": "git",
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8215,10 +8215,10 @@ pundle-cli@2.0.0-beta12:
sb-copy "^1.0.1"
sb-fs "^1.1.1"

pundle-dev@2.0.0-beta12, pundle-dev@^2.0.0-beta12:
pundle-dev@^2.0.0-beta12, pundle-dev@material-motion/pundle-dev:
version "2.0.0-beta12"
resolved "https://registry.yarnpkg.com/pundle-dev/-/pundle-dev-2.0.0-beta12.tgz#9adcfcdfbb2c25bcde76f32d978f575c401ecc60"
integrity sha1-mtz837ssJbzedvMtl49XXEAezGA=
uid "93c3d7d0a7fe13ccd83f1d4714894d26311af953"
resolved "https://codeload.github.com/material-motion/pundle-dev/tar.gz/93c3d7d0a7fe13ccd83f1d4714894d26311af953"
dependencies:
debug "^2.4.4"
express "^4.14.0"
Expand All @@ -8231,7 +8231,7 @@ pundle-dev@2.0.0-beta12, pundle-dev@^2.0.0-beta12:
send "^0.14.1"
ws "^1.1.1"
optionalDependencies:
uws "^0.12.0"
uws "^99.0.0"

pundle-fs@2.0.0-beta12, pundle-fs@^2.0.0-beta12:
version "2.0.0-beta12"
Expand Down Expand Up @@ -10593,10 +10593,10 @@ uuid@^3.0.1:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
integrity sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==

uws@10.148.2, uws@^0.12.0:
version "10.148.2"
resolved "https://registry.yarnpkg.com/uws/-/uws-10.148.2.tgz#f01652a0b4bb941cb18bb7a6248d780fd0150245"
integrity sha1-8BZSoLS7lByxi7emJI14D9AVAkU=
uws@^99.0.0:
version "99.0.0"
resolved "https://registry.yarnpkg.com/uws/-/uws-99.0.0.tgz#15e83cda6a135f6a7a70bd399e865be9a14f8d9b"
integrity sha512-gbzhpHHE37BsiCB1raq5Wzf4ENKTaxyg1gZ7LJ/Z0za9Ic6EEwq5VpfivNh9Or2Tpf3f3jPEWCGLVDle2MukTg==

valid-url@^1:
version "1.0.9"
Expand Down

0 comments on commit a6ea0bb

Please sign in to comment.