Skip to content

Commit

Permalink
Housekeeping and CI Integration
Browse files Browse the repository at this point in the history
  • Loading branch information
obany committed Aug 10, 2017
1 parent 75d5d65 commit 41d23f9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
10 changes: 5 additions & 5 deletions package.json
Expand Up @@ -32,9 +32,9 @@
"devDependencies": {
"@types/chai": "^4.0.1",
"@types/mocha": "^2.2.41",
"@types/node": "^8.0.17",
"@types/node": "^8.0.20",
"@types/phantom": "^3.2.2",
"chai": "^4.1.0",
"chai": "^4.1.1",
"coveralls": "^2.13.1",
"del": "^3.0.0",
"gulp": "^3.9.1",
Expand All @@ -43,12 +43,12 @@
"gulp-mocha": "3.0.0",
"gulp-replace": "^0.6.1",
"gulp-sourcemaps": "^2.6.0",
"gulp-tslint": "^8.1.1",
"gulp-tslint": "^8.1.2",
"gulp-typescript": "^3.2.1",
"merge2": "^1.1.0",
"remap-istanbul": "^0.9.5",
"run-sequence": "^2.0.0",
"tslint": "^5.5.0",
"tslint": "^5.6.0",
"tslint-microsoft-contrib": "^5.0.1",
"typescript": "^2.4.1"
},
Expand All @@ -57,6 +57,6 @@
"jimp": "^0.2.28",
"phantom": "^4.0.5",
"text-encoding": "^0.6.4",
"unitejs-framework": "^0.7.2"
"unitejs-framework": "^0.7.3"
}
}
3 changes: 2 additions & 1 deletion tslint.json
Expand Up @@ -148,7 +148,7 @@
"no-var-keyword": true,
"no-var-requires": true,
"no-var-self": true,
"no-void-expression": true,
"no-void-expression": false,
"object-literal-sort-keys": false, // turn object-literal-sort-keys off and sort keys in a meaningful manner
"one-variable-per-declaration": [true],
"only-arrow-functions": [false], // there are many valid reasons to declare a function
Expand Down Expand Up @@ -236,6 +236,7 @@
"prefer-function-over-method": false,
"prefer-conditional-expression": false,
"strict-type-predicates": false,
"no-submodule-imports": false,

/**
* Deprecated rules. The following rules are deprecated for various reasons.
Expand Down

0 comments on commit 41d23f9

Please sign in to comment.