Skip to content

Commit

Permalink
chore(yarn): use yarn and added missing typings file
Browse files Browse the repository at this point in the history
  • Loading branch information
dotansimha committed Nov 14, 2016
1 parent c8094a6 commit ffdaa8f
Show file tree
Hide file tree
Showing 6 changed files with 1,547 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ install:

script:
# remove unused node modules from cache
- npm prune
- npm install -g [email protected] [email protected] [email protected]
- npm install
- rm -rf node_modules
- npm install -g [email protected] [email protected] [email protected] yarn
- yarn
- npm run test:ci

sudo: required
1 change: 1 addition & 0 deletions dist/ObservableCollection.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// <reference types="chai" />
/// <reference types="meteor-typings" />
import { Observable } from 'rxjs';
import { ObservableCursor } from './ObservableCursor';
Expand Down
11 changes: 8 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"build": "npm run build-only && npm run bundle && npm run docs",
"prepublish": "npm run build",
"build-only": "tsc || echo not ok",
"pretest": "npm run build && cd tests && rm -rf node_modules && npm install",
"pretest": "npm run build && cd tests && rm -rf node_modules && yarn",
"test:ci": "npm run pretest && cd tests && meteor test --once --driver-package dispatch:mocha-phantomjs",
"test": "cd tests && meteor test --driver-package practicalmeteor:mocha",
"lint": "tslint src/**/*.ts",
Expand All @@ -40,14 +40,14 @@
"rxjs": "^5.0.0-beta.12"
},
"devDependencies": {
"meteor-typings": "1.3.1",
"@types/mocha": "2.2.33",
"@types/underscore": "1.7.33",
"conventional-changelog": "1.1.0",
"conventional-changelog-cli": "1.2.0",
"es6-shim": "0.35.1",
"ghooks": "1.3.2",
"jsdoc-to-markdown": "2.0.1",
"meteor-typings": "1.3.1",
"rollup": "0.36.3",
"rxjs": "^5.0.0-beta.12",
"tslint": "3.15.1",
Expand All @@ -56,6 +56,11 @@
"zone.js": "^0.6.22"
},
"greenkeeper": {
"ignore": [ "rxjs" ]
"ignore": [
"rxjs"
]
},
"dependencies": {
"@types/chai": "^3.4.34"
}
}
5 changes: 0 additions & 5 deletions run_tests.sh

This file was deleted.

3 changes: 2 additions & 1 deletion typings.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// <reference types="zone.js" />
/// <reference types="meteor-typings" />
/// <reference types="@types/underscore" />
/// <reference types="@types/underscore" />
/// <reference types="@types/chai" />
Loading

0 comments on commit ffdaa8f

Please sign in to comment.