From b2ffb84c160cb656e21b8456080c4b8a2b2601da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BChler?= Date: Tue, 16 Jan 2018 14:28:55 +0100 Subject: [PATCH] fix(dependencies): upgrading dependencies and build targets (#41) --- .appveyor.yml | 1 + .travis.yml | 16 ++++++++-------- package.json | 22 +++++++++++----------- tslint.json | 48 +----------------------------------------------- 4 files changed, 21 insertions(+), 66 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 971a7a5..c4a2f0f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,6 +4,7 @@ skip_branch_with_pr: true environment: matrix: + - nodejs_version: "9" - nodejs_version: "8" - nodejs_version: "7" - nodejs_version: "6" diff --git a/.travis.yml b/.travis.yml index 44926fa..f831765 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,16 +4,17 @@ stages: - name: test if: tag IS blank - name: deploy - if: branch = master + if: branch = master AND type != pull_request notifications: email: false -env: - - BUILD_LEADER_ID=5 - jobs: include: + - stage: test + node_js: '9' + after_success: + - npm install coveralls@^2.11.9 && cat ./coverage/lcov.info | coveralls - stage: test node_js: '8' after_success: @@ -27,7 +28,7 @@ jobs: after_success: - npm install coveralls@^2.11.9 && cat ./coverage/lcov.info | coveralls - stage: deploy - node_js: '8' + node_js: '9' script: npm run typedoc deploy: provider: pages @@ -35,7 +36,6 @@ jobs: github_token: $GH_TOKEN local_dir: ./docs - stage: deploy - node_js: '8' + node_js: '9' before_script: npm run build - script: echo "Deploy with semantic release" - after_success: npm run semantic-release + script: npm run semantic-release diff --git a/package.json b/package.json index ff91798..f9d5dd3 100644 --- a/package.json +++ b/package.json @@ -30,20 +30,20 @@ "author": "Christoph Bühler ", "license": "MIT", "devDependencies": { - "@types/jest": "^21.1.5", + "@smartive/tslint-config": "^2.0.0", + "@types/jest": "^22.0.1", "del-cli": "^1.1.0", - "jest": "^21.2.1", - "semantic-release": "^9.0.0", - "ts-jest": "^21.1.4", - "tslint": "^5.8.0", - "tslint-config-airbnb": "^5.3.0", - "tsutils": "^2.12.2", + "jest": "^22.1.1", + "semantic-release": "^12.2.2", + "ts-jest": "^22.0.1", + "tslint": "^5.9.1", + "tsutils": "^2.18.0", "typedoc": "^0.9.0", - "typescript": "^2.6.1" + "typescript": "^2.6.2" }, "dependencies": { - "@types/node": "^8.0.47", - "rxjs": "^5.5.2", - "tslib": "^1.8.0" + "@types/node": "^9.3.0", + "rxjs": "^5.5.6", + "tslib": "^1.8.1" } } diff --git a/tslint.json b/tslint.json index 1ccf077..d5c5f71 100644 --- a/tslint.json +++ b/tslint.json @@ -1,58 +1,12 @@ { - "extends": "tslint-config-airbnb", + "extends": "@smartive/tslint-config", "rules": { - "function-name": false, - "max-line-length": [ - true, - 125 - ], - "member-ordering": [ - true, - { - "order": [ - "public-static-field", - "protected-static-field", - "private-static-field", - "public-instance-field", - "protected-instance-field", - "private-instance-field", - "constructor", - "public-static-method", - "protected-static-method", - "private-static-method", - "public-instance-method", - "protected-instance-method", - "private-instance-method" - ] - } - ], - "no-boolean-literal-compare": false, - "strict-boolean-expressions": false, - "no-increment-decrement": false, - "no-trailing-whitespace": [ - true, - "ignore-jsdoc", - "ignore-template-strings" - ], "ter-indent": [ true, 4, { "SwitchCase": 1 } - ], - "typedef": [ - true, - "call-signature", - "parameter", - "property-declaration", - "member-variable-declaration" - ], - "variable-name": [ - true, - "check-format", - "ban-keywords", - "allow-leading-underscore" ] } }