Merge pull request #10 from dzearing/ianc/fixing-lint

Including tslint:disable around the style mapping in the produced scss.ts files.
microsoft · May 4, 2016 · 5ca5b7d · 5ca5b7d
2 parents 1b25cbb + fc6f2dd
commit 5ca5b7d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gulp-core-build-sass",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

diff --git a/src/SassTask.ts b/src/SassTask.ts
@@ -1,7 +1,6 @@
-import {
-  GulpTask
-} from 'gulp-core-build';
+import { GulpTask } from 'gulp-core-build';
 import gulp = require('gulp');
+import { EOL } from 'os';
 
 const scssTsExtName = '.scss.ts';
 
@@ -106,6 +105,7 @@ export class SassTask extends GulpTask<ISassTaskConfig> {
 
           if (classNames) {
             const classNamesLines = [
+              '/* tslint:disable */',
               'const styles = {'
             ];
 
@@ -127,11 +127,13 @@ export class SassTask extends GulpTask<ISassTaskConfig> {
               classNamesLines.push(line);
             });
 
-            classNamesLines.push('};');
-            classNamesLines.push('');
-            classNamesLines.push('export default styles;');
+            classNamesLines.push(
+              '};',
+              '',
+              'export default styles;',
+              '/* tslint:enable */');
 
-            exportClassNames = classNamesLines.join('\n');
+            exportClassNames = classNamesLines.join(EOL);
           }
 
           let lines = [];
@@ -153,7 +155,7 @@ export class SassTask extends GulpTask<ISassTaskConfig> {
             ];
           }
 
-          return lines.join('\n').replace(/\n\n+/, '\n\n');
+          return lines.join(EOL).replace(new RegExp(`${EOL}${EOL}+`), `${EOL}${EOL}`);
         }
       }))
       .pipe(gulp.dest('src')));