Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(dependencies): upgrade deps and build targets #27

Merged
merged 1 commit into from
Jan 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ skip_branch_with_pr: true

environment:
matrix:
- nodejs_version: "9"
- nodejs_version: "8"
- nodejs_version: "7"
- nodejs_version: "6"
Expand Down
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -27,15 +28,14 @@ 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
skip_cleanup: true
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
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,22 @@
"author": "Christoph Bühler <christoph.buehler@bluewin.ch>",
"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": {
"proc-that": "^1.0.1",
"proc-that": "^1.0.2",
"restler": "^3.4.0",
"@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"
}
}
48 changes: 1 addition & 47 deletions tslint.json
Original file line number Diff line number Diff line change
@@ -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"
]
}
}