Skip to content

Commit 836b140

Browse files
committed
chore(package.json): bump up typescript version
- bump up typescript compiler version, compile with --pretty option - markdown test is moved to travis
1 parent 15f35f3 commit 836b140

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ env:
2020
- CXX=g++-4.8
2121
- alias jasmine=./node_modules/.bin/jasmine
2222
- alias tsc=./node_modules/.bin/tsc
23-
- alias babel=./node_modules/.bin/babel
2423

2524
install:
2625
- npm install && npm run lint
2726

2827
script:
29-
- npm test && npm run cover
28+
- npm test && node ./node_modules/markdown-doctest/bin/cmd.js && npm run cover
3029

3130
after_script:
3231
- cat ./coverage/coverage-remapped.lcov | ./node_modules/coveralls/bin/coveralls.js

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
},
1414
"scripts": {
1515
"build_all": "npm run build_es6 && npm run build_amd && npm run build_cjs && npm run build_global",
16-
"build_amd": "rm -rf dist/amd && tsc typings/es6-shim/es6-shim.d.ts src/Rx.ts -m amd --outDir dist/amd --sourcemap --target ES5 --diagnostics",
17-
"build_cjs": "rm -rf dist/cjs && tsc typings/es6-shim/es6-shim.d.ts src/Rx.ts src/Rx.KitchenSink.ts -m commonjs --outDir dist/cjs --sourcemap --target ES5 -d --diagnostics",
18-
"build_es6": "rm -rf dist/es6 && tsc src/Rx.ts src/Rx.KitchenSink.ts --outDir dist/es6 --sourceMap --target ES6 -d --diagnostics",
16+
"build_amd": "rm -rf dist/amd && tsc typings/es6-shim/es6-shim.d.ts src/Rx.ts -m amd --outDir dist/amd --sourcemap --target ES5 --diagnostics --pretty",
17+
"build_cjs": "rm -rf dist/cjs && tsc typings/es6-shim/es6-shim.d.ts src/Rx.ts src/Rx.KitchenSink.ts -m commonjs --outDir dist/cjs --sourcemap --target ES5 -d --diagnostics --pretty",
18+
"build_es6": "rm -rf dist/es6 && tsc src/Rx.ts src/Rx.KitchenSink.ts --outDir dist/es6 --sourceMap --target ES6 -d --diagnostics --pretty",
1919
"build_closure": "java -jar ./node_modules/google-closure-compiler/compiler.jar ./dist/global/Rx.js --language_in ECMASCRIPT5 --create_source_map ./dist/global/Rx.min.js.map --js_output_file ./dist/global/Rx.min.js",
2020
"build_global": "rm -rf dist/global && mkdir \"dist/global\" && browserify src/Rx.global.js --outfile dist/global/Rx.js && npm run build_closure",
2121
"build_perf": "npm run build_cjs && npm run build_global && webdriver-manager update && npm run perf",
@@ -28,7 +28,7 @@
2828
"lint": "npm run lint_src && npm run lint_spec && npm run lint_perf",
2929
"cover": "istanbul cover -x \"*-spec.js index.js *-helper.js spec/helpers/*\" ./node_modules/jasmine/bin/jasmine.js && npm run cover_remapping",
3030
"cover_remapping": "remap-istanbul -i coverage/coverage.json -o coverage/coverage-remapped.json && remap-istanbul -i coverage/coverage.json -o coverage/coverage-remapped.lcov -t lcovonly && remap-istanbul -i coverage/coverage.json -o coverage/coverage-remapped -t html",
31-
"test": "jasmine && markdown-doctest",
31+
"test": "jasmine",
3232
"watch": "watch \"echo triggering build && npm run build_test && echo build completed\" src -d -u -w=15",
3333
"perf": "protractor protractor.conf.js",
3434
"perf_micro": "node ./perf/micro/index.js",
@@ -101,7 +101,7 @@
101101
"remap-istanbul": "0.3.1",
102102
"rx": "latest",
103103
"tslint": "2.5.0",
104-
"typescript": "1.8.0-dev.20151017",
104+
"typescript": "1.8.0-dev.20151115",
105105
"validate-commit-msg": "1.0.0",
106106
"watch": "0.16.0"
107107
},

0 commit comments

Comments
 (0)