Skip to content

Commit

Permalink
chore: lint
Browse files Browse the repository at this point in the history
  • Loading branch information
develar committed Jul 28, 2016
1 parent 3cc7482 commit 86e158f
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 34 deletions.
2 changes: 1 addition & 1 deletion docs/Options.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Here documented only `electron-builder` specific options:
| mac | <a name="BuildMetadata-mac"></a>See [.build.mac](#MacOptions).
| dmg | <a name="BuildMetadata-dmg"></a>See [.build.dmg](#DmgOptions).
| mas | <a name="BuildMetadata-mas"></a>See [.build.mas](#MasBuildOptions).
| win | <a name="BuildMetadata-win"></a>See [.build.win](#LinuxBuildOptions).
| win | <a name="BuildMetadata-win"></a>See [.build.win](#WinBuildOptions).
| nsis | <a name="BuildMetadata-nsis"></a>See [.build.nsis](#NsisOptions).
| linux | <a name="BuildMetadata-linux"></a>See [.build.linux](#LinuxBuildOptions).
| compression | <a name="BuildMetadata-compression"></a>The compression level, one of `store`, `normal`, `maximum` (default: `normal`). If you want to rapidly test build, `store` can reduce build time significantly.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
"pre-git": "^3.10.0",
"should": "^10.0.0",
"ts-babel": "^1.0.3",
"tslint": "3.13.0",
"tslint": "3.14.0",
"typescript": "^2.1.0-dev.20160726",
"whitespace": "^2.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/metadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export interface BuildMetadata {
readonly mas?: MasBuildOptions | null

/**
See [.build.win](#LinuxBuildOptions).
See [.build.win](#WinBuildOptions).
*/
readonly win?: WinBuildOptions | null

Expand Down
2 changes: 2 additions & 0 deletions test/src/helpers/avaEx.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import test from "ava-tf"

/* tslint:disable:no-invalid-this no-namespace */

declare module "ava-tf" {
namespace test {
export const ifNotWindows: typeof test;
Expand Down
2 changes: 1 addition & 1 deletion test/src/helpers/runTests.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { spawn } from "child_process"
import * as path from "path"
import { Promise as BluebirdPromise } from "bluebird"
import { copy, readJson, emptyDir, unlink, readdir, outputFile, readFileSync } from "fs-extra-p"
import { copy, emptyDir, outputFile, readdir, readFileSync, readJson, unlink } from "fs-extra-p"
import { Platform } from "out/metadata"

// we set NODE_PATH in this file, so, we cannot use 'out/awaiter' path here
Expand Down
45 changes: 15 additions & 30 deletions tslint.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,17 @@
{
"extends": "tslint:latest",
"rules": {
"class-name": true,
"curly": true,
"indent": [
true,
"spaces"
],
"member-ordering": [
"static-before-instance",
"variables-before-functions"
],
"no-arg": true,
"no-duplicate-key": true,
"no-consecutive-blank-lines": true,
"no-duplicate-variable": true,
"no-eval": true,
"no-empty": true,
"no-unreachable": true,
"no-unused-expression": true,
"no-unused-variable": [
true,
{
"ignore-pattern": "^_+awaiter$"
}
],
"no-use-before-declare": true,
"no-internal-module": true,
"no-trailing-whitespace": true,
"no-var-keyword": true,
"one-line": [
true,
"check-open-brace",
Expand All @@ -38,10 +22,6 @@
"double",
"avoid-escape"
],
"triple-equals": [
true,
"allow-null-check"
],
"typedef-whitespace": [
true,
{
Expand All @@ -56,6 +36,19 @@
true,
"ban-keywords"
],
"ordered-imports": false,
"semicolon": "never",
"trailing-comma": false,
"object-literal-sort-keys": false,
"no-var-requires": false,
"no-console": false,
"max-line-length": false,
"eofline": false,
"comment-format": false,
"no-conditional-assignment": false,
"interface-name": false,
"member-access": false,
"no-shadowed-variable": false,
"whitespace": [
true,
"check-branch",
Expand All @@ -64,13 +57,5 @@
"check-separator",
"check-type"
]
},
"no-debugger": true,
"no-inferrable-types": true,
"no-shadowed-variable": true,
"no-invalid-this": true,
"no-reference": true,
"semicolon": "never",
"prefer-const": "true",
"one-variable-per-declaration": "true"
}
}

0 comments on commit 86e158f

Please sign in to comment.