Merge pull request #10 from lijunle/enforce-trailing-comma

Enforce trailing comma
microsoft · May 10, 2016 · 0b49a76 · 0b49a76
2 parents 00c1488 + 2eb46f4
commit 0b49a76
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "object-assign": "4.0.1",
     "through2": "2.0.1",
     "ts-npm-lint": "0.1.0",
-    "tslint": "3.6.0",
+    "tslint": "3.9.0",
     "tslint-microsoft-contrib": "2.0.3",
     "typescript": "1.8.9"
   },

diff --git a/src/TextTask.ts b/src/TextTask.ts
@@ -22,8 +22,7 @@ export class TextTask extends GulpTask<ITextTaskConfig> {
     if (textMatch) {
       const commonJSTextStream: NodeJS.ReadWriteStream = gulp.src(textMatch)
         .pipe(texttojs({
-          template: 'module.exports = <%= content %>;',
-
+          template: 'module.exports = <%= content %>;'
         }))
         .pipe(gulp.dest(libFolder));
 

diff --git a/src/defaultTslint.json b/src/defaultTslint.json
@@ -67,7 +67,13 @@
     "quotemark": [true, "single", "avoid-escape"],
     "radix": true,
     "semicolon": true,
-    "trailing-comma": [true, "never"],
+    "trailing-comma": [
+      true,
+      {
+        "multiline": "never",
+        "singleline": "never"
+      }
+    ],
     "triple-equals": [true, "allow-null-check"],
     "typedef": [
       true,