Skip to content

Commit

Permalink
build: move to yarn and update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
yisraelx committed Feb 27, 2018
1 parent 8c8de27 commit 34f3242
Show file tree
Hide file tree
Showing 10 changed files with 7,557 additions and 10,808 deletions.
32 changes: 18 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
sudo: false
language: node_js
node_js:
- '6'
- '8.9.4'
cache:
directories:
- node_modules
yarn: true
directories:
- node_modules
notifications:
email: false
email: false
branches:
only:
- master
except:
- /^v\d+\.\d+\.\d+$/
before_script:
- npm run ci:before
script:
- npm run ci:script
after_success:
- npm run ci:after
only:
- master
except:
- /^v\d+\.\d+\.\d+$/

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH

install: yarn install --frozen-lockfile

script: yarn ci:script
after_success: yarn ci:after
3 changes: 1 addition & 2 deletions karma.conf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ export = (config: Config) => {

files: [
'./node_modules/es6-promise/dist/es6-promise.auto.min.js',
'./node_modules/jasmine-promises/dist/jasmine-promises.js',
'./modules/**/*.ts',
'./test/**/*.ts'
],
Expand Down Expand Up @@ -88,4 +87,4 @@ export = (config: Config) => {
]

} as ConfigOptions);
};
};
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"lerna": "2.2.0",
"lerna": "2.9.0",
"packages": [
"modules/**"
],
Expand Down
2 changes: 1 addition & 1 deletion modules/-rxjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@
"@promises/to-observable": "^0.2.0"
},
"peerDependencies": {
"rxjs": "^5.4.3"
"rxjs": "^5.5.6"
}
}
2 changes: 1 addition & 1 deletion modules/to-observable/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
"@promises/interfaces": "^0.2.0"
},
"peerDependencies": {
"rxjs": "^5.4.3"
"rxjs": "^5.5.6"
}
}
Loading

0 comments on commit 34f3242

Please sign in to comment.