diff --git a/docs/Options.md b/docs/Options.md index 01e1b3926d6..2710895fd58 100644 --- a/docs/Options.md +++ b/docs/Options.md @@ -60,7 +60,7 @@ Here documented only `electron-builder` specific options: | mac | See [.build.mac](#MacOptions). | dmg | See [.build.dmg](#DmgOptions). | mas | See [.build.mas](#MasBuildOptions). -| win | See [.build.win](#LinuxBuildOptions). +| win | See [.build.win](#WinBuildOptions). | nsis | See [.build.nsis](#NsisOptions). | linux | See [.build.linux](#LinuxBuildOptions). | compression | The compression level, one of `store`, `normal`, `maximum` (default: `normal`). If you want to rapidly test build, `store` can reduce build time significantly. diff --git a/package.json b/package.json index 8bf6534faff..bcbb3dd13b3 100644 --- a/package.json +++ b/package.json @@ -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" }, diff --git a/src/metadata.ts b/src/metadata.ts index 2d1b32f052c..d55d84cd2a3 100755 --- a/src/metadata.ts +++ b/src/metadata.ts @@ -164,7 +164,7 @@ export interface BuildMetadata { readonly mas?: MasBuildOptions | null /** - See [.build.win](#LinuxBuildOptions). + See [.build.win](#WinBuildOptions). */ readonly win?: WinBuildOptions | null diff --git a/test/src/helpers/avaEx.ts b/test/src/helpers/avaEx.ts index 7e4e10d440d..2d6bb14664c 100644 --- a/test/src/helpers/avaEx.ts +++ b/test/src/helpers/avaEx.ts @@ -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; diff --git a/test/src/helpers/runTests.ts b/test/src/helpers/runTests.ts index 07b42f85dad..e3dbc73144b 100755 --- a/test/src/helpers/runTests.ts +++ b/test/src/helpers/runTests.ts @@ -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 diff --git a/tslint.json b/tslint.json index bc1e4732ee4..ab5b4252a12 100644 --- a/tslint.json +++ b/tslint.json @@ -1,23 +1,10 @@ { + "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, { @@ -25,9 +12,6 @@ } ], "no-use-before-declare": true, - "no-internal-module": true, - "no-trailing-whitespace": true, - "no-var-keyword": true, "one-line": [ true, "check-open-brace", @@ -38,10 +22,6 @@ "double", "avoid-escape" ], - "triple-equals": [ - true, - "allow-null-check" - ], "typedef-whitespace": [ true, { @@ -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", @@ -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" + } } \ No newline at end of file