diff --git a/.travis.yml b/.travis.yml index d1fa289bff..49591e1fcb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,13 +20,12 @@ env: - CXX=g++-4.8 - alias jasmine=./node_modules/.bin/jasmine - alias tsc=./node_modules/.bin/tsc - - alias babel=./node_modules/.bin/babel install: - npm install && npm run lint script: - - npm test && npm run cover + - npm test && node ./node_modules/markdown-doctest/bin/cmd.js && npm run cover after_script: - cat ./coverage/coverage-remapped.lcov | ./node_modules/coveralls/bin/coveralls.js diff --git a/package.json b/package.json index c1a9659fd3..8607e22ff9 100644 --- a/package.json +++ b/package.json @@ -13,9 +13,9 @@ }, "scripts": { "build_all": "npm run build_es6 && npm run build_amd && npm run build_cjs && npm run build_global", - "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", - "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", - "build_es6": "rm -rf dist/es6 && tsc src/Rx.ts src/Rx.KitchenSink.ts --outDir dist/es6 --sourceMap --target ES6 -d --diagnostics", + "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", + "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", + "build_es6": "rm -rf dist/es6 && tsc src/Rx.ts src/Rx.KitchenSink.ts --outDir dist/es6 --sourceMap --target ES6 -d --diagnostics --pretty", "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", "build_global": "rm -rf dist/global && mkdir \"dist/global\" && browserify src/Rx.global.js --outfile dist/global/Rx.js && npm run build_closure", "build_perf": "npm run build_cjs && npm run build_global && webdriver-manager update && npm run perf", @@ -28,7 +28,7 @@ "lint": "npm run lint_src && npm run lint_spec && npm run lint_perf", "cover": "istanbul cover -x \"*-spec.js index.js *-helper.js spec/helpers/*\" ./node_modules/jasmine/bin/jasmine.js && npm run cover_remapping", "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", - "test": "jasmine && markdown-doctest", + "test": "jasmine", "watch": "watch \"echo triggering build && npm run build_test && echo build completed\" src -d -u -w=15", "perf": "protractor protractor.conf.js", "perf_micro": "node ./perf/micro/index.js", @@ -101,7 +101,7 @@ "remap-istanbul": "0.3.1", "rx": "latest", "tslint": "2.5.0", - "typescript": "1.8.0-dev.20151017", + "typescript": "1.8.0-dev.20151115", "validate-commit-msg": "1.0.0", "watch": "0.16.0" },