Merge branch 'master' into next-line

.circleci/config.yml

@@ -0,0 +1,97 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/node:latest
+    steps:
+      - checkout
+      - restore_cache:
+          key: dependency-cache-{{ checksum "yarn.lock" }}
+      - run:
+          name: Install dependencies
+          command: yarn
+      - save_cache:
+          key: dependency-cache-{{ checksum "yarn.lock" }}
+          paths:
+            - node_modules
+      - run: yarn compile
+      - persist_to_workspace:
+          root: '.'
+          paths:
+            - lib
+            - build
+            - yarn.lock
+  lint:
+    docker:
+      - image: circleci/node:latest
+    steps:
+      - checkout
+      - attach_workspace:
+          at: '.'
+      - restore_cache:
+          key: dependency-cache-{{ checksum "yarn.lock" }}
+      - run: yarn lint
+  test:
+    docker:
+      - image: circleci/node:8
+    steps:
+      - checkout
+      - attach_workspace:
+          at: '.'
+      - restore_cache:
+          key: dependency-cache-{{ checksum "yarn.lock" }}
+      - run: yarn test
+  test2.1:
+    docker:
+      - image: circleci/node:4
+    steps:
+      - checkout
+      - attach_workspace:
+          at: '.'
+      - restore_cache:
+          key: dependency-cache-{{ checksum "yarn.lock" }}
+      - run: yarn add typescript@2.1
+      - run: yarn test
+  test2.4:
+    docker:
+      - image: circleci/node:6
+    steps:
+      - checkout
+      - attach_workspace:
+          at: '.'
+      - restore_cache:
+          key: dependency-cache-{{ checksum "yarn.lock" }}
+      - run: yarn add typescript@2.4
+      - run: yarn test
+  testNext:
+    docker:
+      - image: circleci/node:latest
+    steps:
+      - checkout
+      - attach_workspace:
+          at: '.'
+      - restore_cache:
+          key: dependency-cache-{{ checksum "yarn.lock" }}
+      - run: yarn add typescript@next
+      - run: yarn test
+
+workflows:
+  version: 2
+  build_lint_test:
+    jobs:
+      - build
+      - lint:
+          requires:
+            - build
+      - test:
+          requires:
+            - build
+      - test2.1:
+          requires:
+            - build
+      - test2.4:
+          requires:
+            - build
+      - testNext:
+          requires:
+            - build

.editorconfig

@@ -7,3 +7,6 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[tslint.json]
+indent_size = 2

.gitattributes

@@ -7,3 +7,4 @@
 /test/rules/linebreak-style/**/CRLF/*.lint text eol=crlf
 /test/rules/linebreak-style/**/LF/*.fix text eol=crlf
 /test/rules/jsdoc-format/**/jsdoc-windows.ts.lint text eol=crlf
+/test/rules/object-literal-sort-keys/default/crlf.ts.lint eol=crlf

.gitignore

@@ -11,6 +11,7 @@ node_modules/
 !test/rules/**/node_modules
 tscommand*.txt
 npm-debug.log
+package-lock.json
 # created by grunt-ts for faster compiling
 typings/.basedir.ts
 
@@ -19,7 +20,9 @@ typings/.basedir.ts
 *.swp
 
 docs/_data/rules.json
+docs/_data/formatters.json
 docs/rules/*/index.html
+docs/formatters/*/index.html
 
 /coverage/
-/.nyc_output
+/.nyc_output

.npmignore

@@ -12,6 +12,7 @@
 .vscode
 .nycrc
 .editorconfig
+.circleci
 appveyor.yml
 circle.yml
 tslint.json

.vscode/launch.json

@@ -27,7 +27,7 @@
             "request": "launch",
             "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
             "stopOnEntry": false,
-            "args": ["--reporter", "spec", "--colors", "--no-timeouts", "build/test/**/*Tests.js", "build/test/assert.js"],
+            "args": ["--reporter", "spec", "--colors", "--no-timeouts", "build/test/**/*Tests.js"],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "tsc",
             "runtimeExecutable": null,
@@ -38,7 +38,7 @@
                 "NODE_ENV": "development"
             },
             "console": "internalConsole",
-            "sourceMaps": true, 
+            "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/build/**/*.js"]
         },
         {
@@ -58,7 +58,7 @@
                 "NODE_ENV": "development"
             },
             "console": "internalConsole",
-            "sourceMaps": true, 
+            "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/build/**/*.js"]
         },
         {
@@ -78,7 +78,7 @@
                 "NODE_ENV": "development"
             },
             "console": "internalConsole",
-            "sourceMaps": true, 
+            "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/build/**/*/js"]
         }
     ]

.vscode/settings.json

@@ -22,5 +22,6 @@
     },
 
     // Always use project's provided typescript compiler version
-    "typescript.tsdk": "node_modules/typescript/lib"
+    "typescript.tsdk": "node_modules/typescript/lib",
+    "files.eol": "\n"
 }