Merge branch 'master' into strict_type_predicates

palantir · Jan 19, 2017 · b78a139 · b78a139
2 parents 10b6cee + b6171dd
commit b78a139
Show file tree

Hide file tree

Showing 138 changed files with 799 additions and 3,069 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,6 @@ typings/.basedir.ts
 # vim swap files
 *.swo
 *.swp
+
+docs/_data/rules.json
+docs/rules/
diff --git a/README.md b/README.md
@@ -247,7 +247,7 @@ const files = Linter.getFileNames(program);
 const results = files.map(file => {
     const fileContents = program.getSourceFile(file).getFullText();
     const linter = new Linter(file, fileContents, options, program);
-    return result.lint();
+    return linter.lint();
 });
 ```
 

diff --git a/circle.yml b/circle.yml
@@ -4,10 +4,11 @@ general:
       - gh-pages
 dependencies:
   pre:
-    - case $CIRCLE_NODE_INDEX in 0) nvm use 4.2 ;; 1) nvm use 5.7 ;; 2) nvm use 6.1 ;; esac
+    - case $CIRCLE_NODE_INDEX in 0) nvm use 4.2 ;; 1) nvm use 5.7 ;; [2-3]) nvm use 6.1 ;; esac
 test:
   override:
-    - npm run verify
+    - case $CIRCLE_NODE_INDEX in [0-2]) npm run verify ;; 3) npm run clean && npm run compile && npm i [email protected] && npm run test ;; esac:
+        parallel: true
 deployment:
   npm-latest:
     # match semver tag (e.g. 3.12.7)

diff --git a/docs/rules/adjacent-overload-signatures/index.html b/docs/rules/adjacent-overload-signatures/index.html
diff --git a/docs/rules/align/index.html b/docs/rules/align/index.html
diff --git a/docs/rules/array-type/index.html b/docs/rules/array-type/index.html
diff --git a/docs/rules/arrow-parens/index.html b/docs/rules/arrow-parens/index.html
diff --git a/docs/rules/arrow-return-shorthand/index.html b/docs/rules/arrow-return-shorthand/index.html
diff --git a/docs/rules/ban/index.html b/docs/rules/ban/index.html
diff --git a/docs/rules/callable-types/index.html b/docs/rules/callable-types/index.html
diff --git a/docs/rules/class-name/index.html b/docs/rules/class-name/index.html
diff --git a/docs/rules/comment-format/index.html b/docs/rules/comment-format/index.html
diff --git a/docs/rules/completed-docs/index.html b/docs/rules/completed-docs/index.html