Skip to content

Commit b92efd1

Browse files
committed
Merge pull request #2398 from ide/iojs-3-deps
[npm] Update to stacktrace-parser@0.1.3 and ws@0.8.0 to satisfy io.js 3 / Node 4
2 parents 2fc8ca0 + 514efd1 commit b92efd1

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ cache:
88
- .nvm
99

1010
before_install:
11-
- brew update
11+
# Update brew twice because the first run can fail: https://github.com/Homebrew/homebrew/issues/42553
12+
- brew update; brew update
1213
install:
1314
- brew reinstall xctool nvm
14-
- rm -Rf `node -p "require('os').tmpDir()"`/jest_preprocess_cache
15-
- npm install -g flow-bin@`node -p "require('fs').readFileSync('.flowconfig', 'utf8').split('[version]')[1].trim()"`
1615
- mkdir -p .nvm
1716
- export NVM_DIR="$PWD/.nvm"
1817
- source $(brew --prefix nvm)/nvm.sh
19-
- nvm install iojs-v2
20-
- nvm use iojs-v2
18+
- nvm install iojs-v3
19+
- rm -Rf `node -p "require('os').tmpDir()"`/jest_preprocess_cache
20+
- npm install -g flow-bin@`node -p "require('fs').readFileSync('.flowconfig', 'utf8').split('[version]')[1].trim()"`
2121
- npm config set spin=false
2222
- npm install
2323

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@
6969
"sane": "^1.1.2",
7070
"semver": "^4.3.6",
7171
"source-map": "0.1.31",
72-
"stacktrace-parser": "frantic/stacktrace-parser#493c5e5638",
72+
"stacktrace-parser": "0.1.3",
7373
"uglify-js": "2.4.16",
7474
"underscore": "1.7.0",
7575
"wordwrap": "^1.0.0",
7676
"worker-farm": "^1.3.1",
77-
"ws": "^0.7.2",
77+
"ws": "0.8.0",
7878
"yargs": "1.3.2",
7979
"yeoman-environment": "^1.2.7",
8080
"yeoman-generator": "^0.20.2"

0 commit comments

Comments
 (0)