From bb52a85035d13e6d5a5232c8a85a4559902826cf Mon Sep 17 00:00:00 2001
From: segayuu <segayuu@gmail.com>
Date: Mon, 11 Dec 2017 14:05:15 +0900
Subject: [PATCH 1/8] Delete unnecessary rule invalidation setting

---
 types/vinyl/tslint.json | 64 +----------------------------------------
 1 file changed, 1 insertion(+), 63 deletions(-)

diff --git a/types/vinyl/tslint.json b/types/vinyl/tslint.json
index a41bf5d19a..537285c84b 100644
--- a/types/vinyl/tslint.json
+++ b/types/vinyl/tslint.json
@@ -1,79 +1,17 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
         "comment-format": false,
         "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
         "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
         "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
         "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
         "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
         "no-var-keyword": false,
         "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
         "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
         "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
         "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "space-before-function-paren": false
     }
 }

From 6da8269d521add60d99349f3180fef19d0e01ebc Mon Sep 17 00:00:00 2001
From: segayuu <segayuu@gmail.com>
Date: Fri, 15 Dec 2017 10:09:26 +0900
Subject: [PATCH 2/8] cleanup simple style ignore lint errors

---
 types/vinyl/index.d.ts     |   4 +-
 types/vinyl/tslint.json    |   6 +-
 types/vinyl/vinyl-tests.ts | 365 ++++++++++++++++++-------------------
 3 files changed, 176 insertions(+), 199 deletions(-)

diff --git a/types/vinyl/index.d.ts b/types/vinyl/index.d.ts
index f6cd0c8609..5239147517 100644
--- a/types/vinyl/index.d.ts
+++ b/types/vinyl/index.d.ts
@@ -9,8 +9,8 @@ import * as fs from 'fs';
 
 interface ConstructorOptions {
     /**
-    * The current working directory of the file. Default: process.cwd()
-    */
+     * The current working directory of the file. Default: process.cwd()
+     */
     cwd?: string;
 
     /**
diff --git a/types/vinyl/tslint.json b/types/vinyl/tslint.json
index 537285c84b..e4f0f9f640 100644
--- a/types/vinyl/tslint.json
+++ b/types/vinyl/tslint.json
@@ -1,17 +1,13 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "comment-format": false,
         "dt-header": false,
-        "jsdoc-format": false,
         "no-conditional-assignment": false,
         "no-construct": false,
-        "no-padding": false,
         "no-var-keyword": false,
         "no-var-requires": false,
         "object-literal-shorthand": false,
         "only-arrow-functions": false,
-        "prefer-const": false,
-        "space-before-function-paren": false
+        "prefer-const": false
     }
 }
diff --git a/types/vinyl/vinyl-tests.ts b/types/vinyl/vinyl-tests.ts
index 2fe95e9404..e2b2507d7b 100644
--- a/types/vinyl/vinyl-tests.ts
+++ b/types/vinyl/vinyl-tests.ts
@@ -31,48 +31,46 @@ var isCloneable: (obj: any) => boolean = cloneable.isCloneable;
 
 var isWin = (process.platform === 'win32');
 
-describe('File', function () {
-
-	describe('isVinyl()', function () {
-
-		it('returns true for a Vinyl object', function (done) {
+describe('File', function() {
+	describe('isVinyl()', function() {
+		it('returns true for a Vinyl object', function(done) {
 			var file = new File();
 			var result = File.isVinyl(file);
 			expect(result).toEqual(true);
 			done();
 		});
 
-		it('returns false for a normal object', function (done) {
+		it('returns false for a normal object', function(done) {
 			var result = File.isVinyl({});
 			expect(result).toEqual(false);
 			done();
 		});
 
-		it('returns false for null', function (done) {
+		it('returns false for null', function(done) {
 			var result = File.isVinyl(null);
 			expect(result).toEqual(false);
 			done();
 		});
 
-		it('returns false for a string', function (done) {
+		it('returns false for a string', function(done) {
 			var result = File.isVinyl('foobar');
 			expect(result).toEqual(false);
 			done();
 		});
 
-		it('returns false for a String object', function (done) {
+		it('returns false for a String object', function(done) {
 			var result = File.isVinyl(new String('foobar'));
 			expect(result).toEqual(false);
 			done();
 		});
 
-		it('returns false for a number', function (done) {
+		it('returns false for a number', function(done) {
 			var result = File.isVinyl(1);
 			expect(result).toEqual(false);
 			done();
 		});
 
-		it('returns false for a Number object', function (done) {
+		it('returns false for a Number object', function(done) {
 			var result = File.isVinyl(new Number(1));
 			expect(result).toEqual(false);
 			done();
@@ -81,55 +79,54 @@ describe('File', function () {
 		// This is based on current implementation
 		// A test was added to document and make aware during internal changes
 		// TODO: decide if this should be leak-able
-		it('returns true for a mocked object', function (done) {
+		it('returns true for a mocked object', function(done) {
 			var result = File.isVinyl({ _isVinyl: true });
 			expect(result).toEqual(true);
 			done();
 		});
 	});
 
-	describe('defaults', function () {
-
-		it('defaults cwd to process.cwd', function (done) {
+	describe('defaults', function() {
+		it('defaults cwd to process.cwd', function(done) {
 			var file = new File();
 			expect(file.cwd).toEqual(process.cwd());
 			done();
 		});
 
-		it('defaults base to process.cwd', function (done) {
+		it('defaults base to process.cwd', function(done) {
 			var file = new File();
 			expect(file.base).toEqual(process.cwd());
 			done();
 		});
 
-		it('defaults base to cwd property', function (done) {
+		it('defaults base to cwd property', function(done) {
 			var cwd = path.normalize('/');
 			var file = new File({ cwd: cwd });
 			expect(file.base).toEqual(cwd);
 			done();
 		});
 
-		it('defaults path to null', function (done) {
+		it('defaults path to null', function(done) {
 			var file = new File();
 			expect(file.path).toNotExist();
 			expect(file.path).toEqual(null);
 			done();
 		});
 
-		it('defaults history to an empty array', function (done) {
+		it('defaults history to an empty array', function(done) {
 			var file = new File();
 			expect(file.history).toEqual([]);
 			done();
 		});
 
-		it('defaults stat to null', function (done) {
+		it('defaults stat to null', function(done) {
 			var file = new File();
 			expect(file.stat).toNotExist();
 			expect(file.stat).toEqual(null);
 			done();
 		});
 
-		it('defaults contents to null', function (done) {
+		it('defaults contents to null', function(done) {
 			var file = new File();
 			expect(file.contents).toNotExist();
 			expect(file.contents).toEqual(null);
@@ -137,23 +134,22 @@ describe('File', function () {
 		});
 	});
 
-	describe('constructor()', function () {
-
-		it('sets base', function (done) {
+	describe('constructor()', function() {
+		it('sets base', function(done) {
 			var val = path.normalize('/');
 			var file = new File({ base: val });
 			expect(file.base).toEqual(val);
 			done();
 		});
 
-		it('sets cwd', function (done) {
+		it('sets cwd', function(done) {
 			var val = path.normalize('/');
 			var file = new File({ cwd: val });
 			expect(file.cwd).toEqual(val);
 			done();
 		});
 
-		it('sets path (and history)', function (done) {
+		it('sets path (and history)', function(done) {
 			var val = path.normalize('/test.coffee');
 			var file = new File({ path: val });
 			expect(file.path).toEqual(val);
@@ -161,7 +157,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('sets history (and path)', function (done) {
+		it('sets history (and path)', function(done) {
 			var val = path.normalize('/test.coffee');
 			var file = new File({ history: [val] });
 			expect(file.path).toEqual(val);
@@ -169,28 +165,28 @@ describe('File', function () {
 			done();
 		});
 
-		it('sets stat', function (done) {
+		it('sets stat', function(done) {
 			var val = {};
 			var file = new File({ stat: val as any as fs.Stats });
 			expect(file.stat).toEqual(val);
 			done();
 		});
 
-		it('sets contents', function (done) {
+		it('sets contents', function(done) {
 			var val = new Buffer('test');
 			var file = new File({ contents: val });
 			expect(file.contents).toEqual(val);
 			done();
 		});
 
-		it('sets custom properties', function (done) {
+		it('sets custom properties', function(done) {
 			var sourceMap = {};
 			var file = new File({ sourceMap: sourceMap }) as TestFile;
 			expect(file.sourceMap).toEqual(sourceMap);
 			done();
 		});
 
-		it('normalizes path', function (done) {
+		it('normalizes path', function(done) {
 			var val = '/test/foo/../test.coffee';
 			var expected = path.normalize(val);
 			var file = new File({ path: val });
@@ -199,7 +195,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('normalizes and removes trailing separator from path', function (done) {
+		it('normalizes and removes trailing separator from path', function(done) {
 			var val = '/test/foo/../foo/';
 			var expected = path.normalize(val.slice(0, -1));
 			var file = new File({ path: val });
@@ -207,12 +203,12 @@ describe('File', function () {
 			done();
 		});
 
-		it('normalizes history', function (done) {
+		it('normalizes history', function(done) {
 			var val = [
 				'/test/bar/../bar/test.coffee',
 				'/test/foo/../test.coffee',
 			];
-			var expected = val.map(function (p) {
+			var expected = val.map(function(p) {
 				return path.normalize(p);
 			});
 			var file = new File({ history: val });
@@ -221,12 +217,12 @@ describe('File', function () {
 			done();
 		});
 
-		it('normalizes and removes trailing separator from history', function (done) {
+		it('normalizes and removes trailing separator from history', function(done) {
 			var val = [
 				'/test/foo/../foo/',
 				'/test/bar/../bar/',
 			];
-			var expected = val.map(function (p) {
+			var expected = val.map(function(p) {
 				return path.normalize(p.slice(0, -1));
 			});
 			var file = new File({ history: val });
@@ -234,7 +230,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('appends path to history if both exist and different from last', function (done) {
+		it('appends path to history if both exist and different from last', function(done) {
 			var val = path.normalize('/test/baz/test.coffee');
 			var history = [
 				path.normalize('/test/bar/test.coffee'),
@@ -249,7 +245,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not append path to history if both exist and same as last', function (done) {
+		it('does not append path to history if both exist and same as last', function(done) {
 			var val = path.normalize('/test/baz/test.coffee');
 			var history = [
 				path.normalize('/test/bar/test.coffee'),
@@ -263,7 +259,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not mutate history array passed in', function (done) {
+		it('does not mutate history array passed in', function(done) {
 			var val = path.normalize('/test/baz/test.coffee');
 			var history = [
 				path.normalize('/test/bar/test.coffee'),
@@ -281,158 +277,154 @@ describe('File', function () {
 		});
 	});
 
-	describe('isBuffer()', function () {
-
-		it('returns true when the contents are a Buffer', function (done) {
+	describe('isBuffer()', function() {
+		it('returns true when the contents are a Buffer', function(done) {
 			var val = new Buffer('test');
 			var file = new File({ contents: val });
 			expect(file.isBuffer()).toEqual(true);
 			done();
 		});
 
-		it('returns false when the contents are a Stream', function (done) {
+		it('returns false when the contents are a Stream', function(done) {
 			var val = from([]);
 			var file = new File({ contents: val });
 			expect(file.isBuffer()).toEqual(false);
 			done();
 		});
 
-		it('returns false when the contents are null', function (done) {
+		it('returns false when the contents are null', function(done) {
 			var file = new File({ contents: null });
 			expect(file.isBuffer()).toEqual(false);
 			done();
 		});
 	});
 
-	describe('isStream()', function () {
-
-		it('returns false when the contents are a Buffer', function (done) {
+	describe('isStream()', function() {
+		it('returns false when the contents are a Buffer', function(done) {
 			var val = new Buffer('test');
 			var file = new File({ contents: val });
 			expect(file.isStream()).toEqual(false);
 			done();
 		});
 
-		it('returns true when the contents are a Stream', function (done) {
+		it('returns true when the contents are a Stream', function(done) {
 			var val = from([]);
 			var file = new File({ contents: val });
 			expect(file.isStream()).toEqual(true);
 			done();
 		});
 
-		it('returns false when the contents are null', function (done) {
+		it('returns false when the contents are null', function(done) {
 			var file = new File({ contents: null });
 			expect(file.isStream()).toEqual(false);
 			done();
 		});
 	});
 
-	describe('isNull()', function () {
-
-		it('returns false when the contents are a Buffer', function (done) {
+	describe('isNull()', function() {
+		it('returns false when the contents are a Buffer', function(done) {
 			var val = new Buffer('test');
 			var file = new File({ contents: val });
 			expect(file.isNull()).toEqual(false);
 			done();
 		});
 
-		it('returns false when the contents are a Stream', function (done) {
+		it('returns false when the contents are a Stream', function(done) {
 			var val = from([]);
 			var file = new File({ contents: val });
 			expect(file.isNull()).toEqual(false);
 			done();
 		});
 
-		it('returns true when the contents are null', function (done) {
+		it('returns true when the contents are null', function(done) {
 			var file = new File({ contents: null });
 			expect(file.isNull()).toEqual(true);
 			done();
 		});
 	});
 
-	describe('isDirectory()', function () {
+	describe('isDirectory()', function() {
 		var fakeStat = {
-			isDirectory: function () {
+			isDirectory: function() {
 				return true;
 			},
 		} as any as fs.Stats;
 
-		it('returns false when the contents are a Buffer', function (done) {
+		it('returns false when the contents are a Buffer', function(done) {
 			var val = new Buffer('test');
 			var file = new File({ contents: val, stat: fakeStat });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 
-		it('returns false when the contents are a Stream', function (done) {
+		it('returns false when the contents are a Stream', function(done) {
 			var val = from([]);
 			var file = new File({ contents: val, stat: fakeStat });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 
-		it('returns true when the contents are null & stat.isDirectory is true', function (done) {
+		it('returns true when the contents are null & stat.isDirectory is true', function(done) {
 			var file = new File({ contents: null, stat: fakeStat });
 			expect(file.isDirectory()).toEqual(true);
 			done();
 		});
 
-		it('returns false when stat exists but does not contain an isDirectory method', function (done) {
+		it('returns false when stat exists but does not contain an isDirectory method', function(done) {
 			var file = new File({ contents: null, stat: {} as any as fs.Stats });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 
-		it('returns false when stat does not exist', function (done) {
+		it('returns false when stat does not exist', function(done) {
 			var file = new File({ contents: null });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 	});
 
-	describe('isSymbolic()', function () {
+	describe('isSymbolic()', function() {
 		var fakeStat = {
-			isSymbolicLink: function () {
+			isSymbolicLink: function() {
 				return true;
 			},
 		} as any as fs.Stats;
 
-		it('returns false when the contents are a Buffer', function (done) {
+		it('returns false when the contents are a Buffer', function(done) {
 			var val = new Buffer('test');
 			var file = new File({ contents: val, stat: fakeStat });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 
-		it('returns false when the contents are a Stream', function (done) {
+		it('returns false when the contents are a Stream', function(done) {
 			var val = from([]);
 			var file = new File({ contents: val, stat: fakeStat });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 
-		it('returns true when the contents are null & stat.isSymbolicLink is true', function (done) {
+		it('returns true when the contents are null & stat.isSymbolicLink is true', function(done) {
 			var file = new File({ contents: null, stat: fakeStat });
 			expect(file.isSymbolic()).toEqual(true);
 			done();
 		});
 
-		it('returns false when stat exists but does not contain an isSymbolicLink method', function (done) {
+		it('returns false when stat exists but does not contain an isSymbolicLink method', function(done) {
 			var file = new File({ contents: null, stat: {} as any as fs.Stats });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 
-		it('returns false when stat does not exist', function (done) {
+		it('returns false when stat does not exist', function(done) {
 			var file = new File({ contents: null });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 	});
 
-	describe('clone()', function () {
-
-		it('copies all attributes over with Buffer contents', function (done) {
+	describe('clone()', function() {
+		it('copies all attributes over with Buffer contents', function(done) {
 			var options = {
 				cwd: '/',
 				base: '/test/',
@@ -451,7 +443,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('assigns Buffer content reference when contents option is false', function (done) {
+		it('assigns Buffer content reference when contents option is false', function(done) {
 			var options = {
 				cwd: '/',
 				base: '/test/',
@@ -467,12 +459,12 @@ describe('File', function () {
 			expect(copy2.contents).toNotBe(file.contents);
 
 			// TypeScript: expected compilation error
-			//var copy3 = file.clone({ contents: 'invalid' });
-			//expect(copy3.contents).toNotBe(file.contents);
-			//done();
+			// var copy3 = file.clone({ contents: 'invalid' });
+			// expect(copy3.contents).toNotBe(file.contents);
+			// done();
 		});
 
-		it('copies all attributes over with Stream contents', function (done) {
+		it('copies all attributes over with Stream contents', function(done) {
 			var options = {
 				cwd: '/',
 				base: '/test/',
@@ -507,20 +499,20 @@ describe('File', function () {
 
 			pipe([
 				file.contents,
-				concat(function (d) {
+				concat(function(d) {
 					data = d;
 				}),
 			], assert);
 
 			pipe([
 				file2.contents,
-				concat(function (d) {
+				concat(function(d) {
 					data2 = d;
 				}),
 			], assert);
 		});
 
-		it('does not start flowing until all clones flows (data)', function (done) {
+		it('does not start flowing until all clones flows (data)', function(done) {
 			var options = {
 				cwd: '/',
 				base: '/test/',
@@ -542,17 +534,17 @@ describe('File', function () {
 			}
 
 			// Start flowing file2
-			file2.contents.on('data', function (chunk: Buffer) {
+			file2.contents.on('data', function(chunk: Buffer) {
 				data2 += chunk.toString('utf8');
 			});
 
-			process.nextTick(function () {
+			process.nextTick(function() {
 				// Nothing was written yet
 				expect(data).toEqual('');
 				expect(data2).toEqual('');
 
 				// Starts flowing file
-				file.contents.on('data', function (chunk: Buffer) {
+				file.contents.on('data', function(chunk: Buffer) {
 					data += chunk.toString('utf8');
 				});
 			});
@@ -561,7 +553,7 @@ describe('File', function () {
 			file.contents.on('end', assert);
 		});
 
-		it('does not start flowing until all clones flows (readable)', function (done) {
+		it('does not start flowing until all clones flows (readable)', function(done) {
 			var options = {
 				cwd: '/',
 				base: '/test/',
@@ -578,7 +570,7 @@ describe('File', function () {
 			}
 
 			// Start flowing file2
-			file2.contents.on('readable', function (this: NodeJS.ReadableStream) {
+			file2.contents.on('readable', function(this: NodeJS.ReadableStream) {
 				var chunk: string | Buffer;
 				while ((chunk = this.read()) !== null) {
 					data2 += chunk.toString();
@@ -591,7 +583,7 @@ describe('File', function () {
 			], done);
 		});
 
-		it('copies all attributes over with null contents', function (done) {
+		it('copies all attributes over with null contents', function(done) {
 			var options = {
 				cwd: '/',
 				base: '/test/',
@@ -609,7 +601,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('properly clones the `stat` property', function (done) {
+		it('properly clones the `stat` property', function(done) {
 			var options = {
 				cwd: '/',
 				base: '/test/',
@@ -631,7 +623,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('properly clones the `history` property', function (done) {
+		it('properly clones the `history` property', function(done) {
 			var options = {
 				cwd: path.normalize('/'),
 				base: path.normalize('/test/'),
@@ -648,7 +640,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('copies custom properties', function (done) {
+		it('copies custom properties', function(done) {
 			var options = {
 				cwd: '/',
 				base: '/test/',
@@ -670,7 +662,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('copies history', function (done) {
+		it('copies history', function(done) {
 			var options = {
 				cwd: '/',
 				base: '/test/',
@@ -694,7 +686,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('supports deep & shallow copy of all attributes', function (done) {
+		it('supports deep & shallow copy of all attributes', function(done) {
 			var options = {
 				cwd: '/',
 				base: '/test/',
@@ -755,22 +747,21 @@ describe('File', function () {
 		// });
 	});
 
-	describe('inspect()', function () {
-
-		it('returns correct format when no contents and no path', function (done) {
+	describe('inspect()', function() {
+		it('returns correct format when no contents and no path', function(done) {
 			var file = new File();
 			expect(file.inspect()).toEqual('<File >');
 			done();
 		});
 
-		it('returns correct format when Buffer contents and no path', function (done) {
+		it('returns correct format when Buffer contents and no path', function(done) {
 			var val = new Buffer('test');
 			var file = new File({ contents: val });
 			expect(file.inspect()).toEqual('<File <Buffer 74 65 73 74>>');
 			done();
 		});
 
-		it('returns correct format when Buffer contents and relative path', function (done) {
+		it('returns correct format when Buffer contents and relative path', function(done) {
 			var val = new Buffer('test');
 			var file = new File({
 				cwd: '/',
@@ -782,7 +773,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('returns correct format when Stream contents and relative path', function (done) {
+		it('returns correct format when Stream contents and relative path', function(done) {
 			var file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -793,7 +784,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('returns correct format when null contents and relative path', function (done) {
+		it('returns correct format when null contents and relative path', function(done) {
 			var file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -805,9 +796,8 @@ describe('File', function () {
 		});
 	});
 
-	describe('contents get/set', function () {
-
-		it('returns _contents', function (done) {
+	describe('contents get/set', function() {
+		it('returns _contents', function(done) {
 			var val = new Buffer('test');
 			var file = new File() as TestFile;
 			file._contents = val;
@@ -815,7 +805,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('sets _contents', function (done) {
+		it('sets _contents', function(done) {
 			var val = new Buffer('test');
 			var file = new File() as TestFile;
 			file.contents = val;
@@ -823,7 +813,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('sets a Buffer', function (done) {
+		it('sets a Buffer', function(done) {
 			var val = new Buffer('test');
 			var file = new File();
 			file.contents = val;
@@ -831,7 +821,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('wraps Stream in Cloneable', function (done) {
+		it('wraps Stream in Cloneable', function(done) {
 			var val = from([]);
 			var file = new File();
 			file.contents = val;
@@ -839,7 +829,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not double wrap a Cloneable', function (done) {
+		it('does not double wrap a Cloneable', function(done) {
 			var val = from([]);
 			var clone = cloneable(val);
 			var file = new File();
@@ -848,7 +838,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('sets null', function (done) {
+		it('sets null', function(done) {
 			var val = null;
 			var file = new File();
 			file.contents = val;
@@ -868,9 +858,8 @@ describe('File', function () {
 		// });
 	});
 
-	describe('cwd get/set', function () {
-
-		it('returns _cwd', function (done) {
+	describe('cwd get/set', function() {
+		it('returns _cwd', function(done) {
 			var val = '/test';
 			var file = new File() as TestFile;
 			file._cwd = val;
@@ -878,7 +867,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('sets _cwd', function (done) {
+		it('sets _cwd', function(done) {
 			var val = '/test';
 			var file = new File() as TestFile;
 			file.cwd = val;
@@ -886,7 +875,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('normalizes and removes trailing separator on set', function (done) {
+		it('normalizes and removes trailing separator on set', function(done) {
 			var val = '/test/foo/../foo/';
 			var expected = path.normalize(val.slice(0, -1));
 			var file = new File();
@@ -931,15 +920,14 @@ describe('File', function () {
 		// });
 	});
 
-	describe('base get/set', function () {
-
-		it('proxies cwd when omitted', function (done) {
+	describe('base get/set', function() {
+		it('proxies cwd when omitted', function(done) {
 			var file = new File({ cwd: '/test' });
 			expect(file.base).toEqual(file.cwd);
 			done();
 		});
 
-		it('proxies cwd when same', function (done) {
+		it('proxies cwd when same', function(done) {
 			var file = new File({
 				cwd: '/test',
 				base: '/test',
@@ -972,7 +960,7 @@ describe('File', function () {
 		// 	done();
 		// });
 
-		it('returns _base', function (done) {
+		it('returns _base', function(done) {
 			var val = '/test/';
 			var file = new File() as TestFile;
 			file._base = val;
@@ -980,7 +968,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('sets _base', function (done) {
+		it('sets _base', function(done) {
 			var val = '/test/foo';
 			var file = new File() as TestFile;
 			file.base = val;
@@ -988,7 +976,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('normalizes and removes trailing separator on set', function (done) {
+		it('normalizes and removes trailing separator on set', function(done) {
 			var val = '/test/foo/../foo/';
 			var expected = path.normalize(val.slice(0, -1));
 			var file = new File();
@@ -1032,9 +1020,8 @@ describe('File', function () {
 		// });
 	});
 
-	describe('relative get/set', function () {
-
-		it('throws on set', function (done) {
+	describe('relative get/set', function() {
+		it('throws on set', function(done) {
 			var file = new File();
 
 			function invalid() {
@@ -1045,7 +1032,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('throws on get with no path', function (done) {
+		it('throws on get with no path', function(done) {
 			var file = new File();
 
 			function invalid() {
@@ -1056,7 +1043,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('returns a relative path from base', function (done) {
+		it('returns a relative path from base', function(done) {
 			var file = new File({
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1066,7 +1053,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('returns a relative path from cwd', function (done) {
+		it('returns a relative path from cwd', function(done) {
 			var file = new File({
 				cwd: '/',
 				path: '/test/test.coffee',
@@ -1076,12 +1063,12 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not append separator when directory', function (done) {
+		it('does not append separator when directory', function(done) {
 			var file = new File({
 				base: '/test',
 				path: '/test/foo/bar',
 				stat: {
-					isDirectory: function () {
+					isDirectory: function() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1091,12 +1078,12 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not append separator when symlink', function (done) {
+		it('does not append separator when symlink', function(done) {
 			var file = new File({
 				base: '/test',
 				path: '/test/foo/bar',
 				stat: {
-					isSymbolicLink: function () {
+					isSymbolicLink: function() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1106,15 +1093,15 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not append separator when directory & symlink', function (done) {
+		it('does not append separator when directory & symlink', function(done) {
 			var file = new File({
 				base: '/test',
 				path: '/test/foo/bar',
 				stat: {
-					isDirectory: function () {
+					isDirectory: function() {
 						return true;
 					},
-					isSymbolicLink: function () {
+					isSymbolicLink: function() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1125,9 +1112,8 @@ describe('File', function () {
 		});
 	});
 
-	describe('dirname get/set', function () {
-
-		it('throws on get with no path', function (done) {
+	describe('dirname get/set', function() {
+		it('throws on get with no path', function(done) {
 			var file = new File();
 
 			function invalid() {
@@ -1138,7 +1124,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('returns the dirname without trailing separator', function (done) {
+		it('returns the dirname without trailing separator', function(done) {
 			var file = new File({
 				cwd: '/',
 				base: '/test',
@@ -1149,7 +1135,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('throws on set with no path', function (done) {
+		it('throws on set with no path', function(done) {
 			var file = new File();
 
 			function invalid() {
@@ -1160,7 +1146,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('replaces the dirname of the path', function (done) {
+		it('replaces the dirname of the path', function(done) {
 			var file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -1173,9 +1159,8 @@ describe('File', function () {
 		});
 	});
 
-	describe('basename get/set', function () {
-
-		it('throws on get with no path', function (done) {
+	describe('basename get/set', function() {
+		it('throws on get with no path', function(done) {
 			var file = new File();
 
 			function invalid() {
@@ -1186,7 +1171,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('returns the basename of the path', function (done) {
+		it('returns the basename of the path', function(done) {
 			var file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -1197,11 +1182,11 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not append trailing separator when directory', function (done) {
+		it('does not append trailing separator when directory', function(done) {
 			var file = new File({
 				path: '/test/foo',
 				stat: {
-					isDirectory: function () {
+					isDirectory: function() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1211,11 +1196,11 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not append trailing separator when symlink', function (done) {
+		it('does not append trailing separator when symlink', function(done) {
 			var file = new File({
 				path: '/test/foo',
 				stat: {
-					isSymbolicLink: function () {
+					isSymbolicLink: function() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1225,14 +1210,14 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not append trailing separator when directory & symlink', function (done) {
+		it('does not append trailing separator when directory & symlink', function(done) {
 			var file = new File({
 				path: '/test/foo',
 				stat: {
-					isDirectory: function () {
+					isDirectory: function() {
 						return true;
 					},
-					isSymbolicLink: function () {
+					isSymbolicLink: function() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1242,7 +1227,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('removes trailing separator', function (done) {
+		it('removes trailing separator', function(done) {
 			var file = new File({
 				path: '/test/foo/',
 			});
@@ -1251,11 +1236,11 @@ describe('File', function () {
 			done();
 		});
 
-		it('removes trailing separator when directory', function (done) {
+		it('removes trailing separator when directory', function(done) {
 			var file = new File({
 				path: '/test/foo/',
 				stat: {
-					isDirectory: function () {
+					isDirectory: function() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1265,11 +1250,11 @@ describe('File', function () {
 			done();
 		});
 
-		it('removes trailing separator when symlink', function (done) {
+		it('removes trailing separator when symlink', function(done) {
 			var file = new File({
 				path: '/test/foo/',
 				stat: {
-					isSymbolicLink: function () {
+					isSymbolicLink: function() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1279,14 +1264,14 @@ describe('File', function () {
 			done();
 		});
 
-		it('removes trailing separator when directory & symlink', function (done) {
+		it('removes trailing separator when directory & symlink', function(done) {
 			var file = new File({
 				path: '/test/foo/',
 				stat: {
-					isDirectory: function () {
+					isDirectory: function() {
 						return true;
 					},
-					isSymbolicLink: function () {
+					isSymbolicLink: function() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1296,7 +1281,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('throws on set with no path', function (done) {
+		it('throws on set with no path', function(done) {
 			var file = new File();
 
 			function invalid() {
@@ -1307,7 +1292,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('replaces the basename of the path', function (done) {
+		it('replaces the basename of the path', function(done) {
 			var file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -1320,9 +1305,8 @@ describe('File', function () {
 		});
 	});
 
-	describe('stem get/set', function () {
-
-		it('throws on get with no path', function (done) {
+	describe('stem get/set', function() {
+		it('throws on get with no path', function(done) {
 			var file = new File();
 
 			function invalid() {
@@ -1333,7 +1317,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('returns the stem of the path', function (done) {
+		it('returns the stem of the path', function(done) {
 			var file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -1344,7 +1328,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('throws on set with no path', function (done) {
+		it('throws on set with no path', function(done) {
 			var file = new File();
 
 			function invalid() {
@@ -1355,7 +1339,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('replaces the stem of the path', function (done) {
+		it('replaces the stem of the path', function(done) {
 			var file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -1368,9 +1352,8 @@ describe('File', function () {
 		});
 	});
 
-	describe('extname get/set', function () {
-
-		it('throws on get with no path', function (done) {
+	describe('extname get/set', function() {
+		it('throws on get with no path', function(done) {
 			var file = new File();
 
 			function invalid() {
@@ -1381,7 +1364,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('returns the extname of the path', function (done) {
+		it('returns the extname of the path', function(done) {
 			var file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -1392,7 +1375,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('throws on set with no path', function (done) {
+		it('throws on set with no path', function(done) {
 			var file = new File();
 
 			function invalid() {
@@ -1403,7 +1386,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('replaces the extname of the path', function (done) {
+		it('replaces the extname of the path', function(done) {
 			var file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -1416,9 +1399,8 @@ describe('File', function () {
 		});
 	});
 
-	describe('path get/set', function () {
-
-		it('records path in history upon instantiation', function (done) {
+	describe('path get/set', function() {
+		it('records path in history upon instantiation', function(done) {
 			var file = new File({
 				cwd: '/',
 				path: '/test/test.coffee',
@@ -1432,7 +1414,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('records path in history when set', function (done) {
+		it('records path in history when set', function(done) {
 			var val = path.normalize('/test/test.js');
 			var file = new File({
 				cwd: '/',
@@ -1456,7 +1438,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not record path in history when set to the current path', function (done) {
+		it('does not record path in history when set to the current path', function(done) {
 			var val = path.normalize('/test/test.coffee');
 			var file = new File({
 				cwd: '/',
@@ -1473,7 +1455,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('does not record path in history when set to empty string', function (done) {
+		it('does not record path in history when set to empty string', function(done) {
 			var val = path.normalize('/test/test.coffee');
 			var file = new File({
 				cwd: '/',
@@ -1504,7 +1486,7 @@ describe('File', function () {
 		//   done();
 		// });
 
-		it('normalizes the path upon set', function (done) {
+		it('normalizes the path upon set', function(done) {
 			var val = '/test/foo/../test.coffee';
 			var expected = path.normalize(val);
 			var file = new File();
@@ -1516,7 +1498,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('removes the trailing separator upon set', function (done) {
+		it('removes the trailing separator upon set', function(done) {
 			var file = new File();
 			file.path = '/test/';
 
@@ -1525,10 +1507,10 @@ describe('File', function () {
 			done();
 		});
 
-		it('removes the trailing separator upon set when directory', function (done) {
+		it('removes the trailing separator upon set when directory', function(done) {
 			var file = new File({
 				stat: {
-					isDirectory: function () {
+					isDirectory: function() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1540,10 +1522,10 @@ describe('File', function () {
 			done();
 		});
 
-		it('removes the trailing separator upon set when symlink', function (done) {
+		it('removes the trailing separator upon set when symlink', function(done) {
 			var file = new File({
 				stat: {
-					isSymbolicLink: function () {
+					isSymbolicLink: function() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1555,13 +1537,13 @@ describe('File', function () {
 			done();
 		});
 
-		it('removes the trailing separator upon set when directory & symlink', function (done) {
+		it('removes the trailing separator upon set when directory & symlink', function(done) {
 			var file = new File({
 				stat: {
-					isDirectory: function () {
+					isDirectory: function() {
 						return true;
 					},
-					isSymbolicLink: function () {
+					isSymbolicLink: function() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1574,16 +1556,15 @@ describe('File', function () {
 		});
 	});
 
-	describe('symlink get/set', function () {
-
-		it('return null on get with no symlink', function (done) {
+	describe('symlink get/set', function() {
+		it('return null on get with no symlink', function(done) {
 			var file = new File();
 
 			expect(file.symlink).toEqual(null);
 			done();
 		});
 
-		it('returns _symlink', function (done) {
+		it('returns _symlink', function(done) {
 			var val = '/test/test.coffee';
 			var file = new File() as TestFile;
 			file._symlink = val;
@@ -1592,7 +1573,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('throws on set with non-string', function (done) {
+		it('throws on set with non-string', function(done) {
 			var file = new File();
 
 			function invalid() {
@@ -1603,7 +1584,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('sets _symlink', function (done) {
+		it('sets _symlink', function(done) {
 			var val = '/test/test.coffee';
 			var expected = path.normalize(val);
 			var file = new File() as TestFile;
@@ -1613,7 +1594,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('allows relative symlink', function (done) {
+		it('allows relative symlink', function(done) {
 			var val = 'test.coffee';
 			var file = new File();
 			file.symlink = val;
@@ -1622,7 +1603,7 @@ describe('File', function () {
 			done();
 		});
 
-		it('normalizes and removes trailing separator upon set', function (done) {
+		it('normalizes and removes trailing separator upon set', function(done) {
 			var val = '/test/foo/../bar/';
 			var expected = path.normalize(val.slice(0, -1));
 			var file = new File();

From 1107825556daf7542ea89247cd178b8dbb3a0315 Mon Sep 17 00:00:00 2001
From: segayuu <segayuu@gmail.com>
Date: Fri, 15 Dec 2017 10:25:17 +0900
Subject: [PATCH 3/8] cleanup ignore lint errors: no-var-keyword,
 object-literal-shorthand

---
 types/vinyl/tslint.json    |   2 -
 types/vinyl/vinyl-tests.ts | 520 ++++++++++++++++++-------------------
 2 files changed, 260 insertions(+), 262 deletions(-)

diff --git a/types/vinyl/tslint.json b/types/vinyl/tslint.json
index e4f0f9f640..4c5f80b2f4 100644
--- a/types/vinyl/tslint.json
+++ b/types/vinyl/tslint.json
@@ -4,9 +4,7 @@
         "dt-header": false,
         "no-conditional-assignment": false,
         "no-construct": false,
-        "no-var-keyword": false,
         "no-var-requires": false,
-        "object-literal-shorthand": false,
         "only-arrow-functions": false,
         "prefer-const": false
     }
diff --git a/types/vinyl/vinyl-tests.ts b/types/vinyl/vinyl-tests.ts
index e2b2507d7b..079588a4e7 100644
--- a/types/vinyl/vinyl-tests.ts
+++ b/types/vinyl/vinyl-tests.ts
@@ -3,8 +3,8 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as expect from 'expect';
-var miss = require('mississippi');
-var cloneable = require('cloneable-readable');
+const miss = require('mississippi');
+const cloneable = require('cloneable-readable');
 
 import File = require('vinyl');
 
@@ -24,54 +24,54 @@ interface TestFile extends File {
 	_base?: string;
 }
 
-var pipe: (streams: [NodeJS.ReadableStream, NodeJS.WritableStream], cb: (err?: Error) => void) => void = miss.pipe;
-var from: (values: any[]) => NodeJS.ReadableStream = miss.from;
-var concat: (fn: (d: Buffer) => void) => NodeJS.WritableStream = miss.concat;
-var isCloneable: (obj: any) => boolean = cloneable.isCloneable;
+let pipe: (streams: [NodeJS.ReadableStream, NodeJS.WritableStream], cb: (err?: Error) => void) => void = miss.pipe;
+let from: (values: any[]) => NodeJS.ReadableStream = miss.from;
+let concat: (fn: (d: Buffer) => void) => NodeJS.WritableStream = miss.concat;
+let isCloneable: (obj: any) => boolean = cloneable.isCloneable;
 
-var isWin = (process.platform === 'win32');
+let isWin = (process.platform === 'win32');
 
 describe('File', function() {
 	describe('isVinyl()', function() {
 		it('returns true for a Vinyl object', function(done) {
-			var file = new File();
-			var result = File.isVinyl(file);
+			let file = new File();
+			let result = File.isVinyl(file);
 			expect(result).toEqual(true);
 			done();
 		});
 
 		it('returns false for a normal object', function(done) {
-			var result = File.isVinyl({});
+			let result = File.isVinyl({});
 			expect(result).toEqual(false);
 			done();
 		});
 
 		it('returns false for null', function(done) {
-			var result = File.isVinyl(null);
+			let result = File.isVinyl(null);
 			expect(result).toEqual(false);
 			done();
 		});
 
 		it('returns false for a string', function(done) {
-			var result = File.isVinyl('foobar');
+			let result = File.isVinyl('foobar');
 			expect(result).toEqual(false);
 			done();
 		});
 
 		it('returns false for a String object', function(done) {
-			var result = File.isVinyl(new String('foobar'));
+			let result = File.isVinyl(new String('foobar'));
 			expect(result).toEqual(false);
 			done();
 		});
 
 		it('returns false for a number', function(done) {
-			var result = File.isVinyl(1);
+			let result = File.isVinyl(1);
 			expect(result).toEqual(false);
 			done();
 		});
 
 		it('returns false for a Number object', function(done) {
-			var result = File.isVinyl(new Number(1));
+			let result = File.isVinyl(new Number(1));
 			expect(result).toEqual(false);
 			done();
 		});
@@ -80,7 +80,7 @@ describe('File', function() {
 		// A test was added to document and make aware during internal changes
 		// TODO: decide if this should be leak-able
 		it('returns true for a mocked object', function(done) {
-			var result = File.isVinyl({ _isVinyl: true });
+			let result = File.isVinyl({ _isVinyl: true });
 			expect(result).toEqual(true);
 			done();
 		});
@@ -88,46 +88,46 @@ describe('File', function() {
 
 	describe('defaults', function() {
 		it('defaults cwd to process.cwd', function(done) {
-			var file = new File();
+			let file = new File();
 			expect(file.cwd).toEqual(process.cwd());
 			done();
 		});
 
 		it('defaults base to process.cwd', function(done) {
-			var file = new File();
+			let file = new File();
 			expect(file.base).toEqual(process.cwd());
 			done();
 		});
 
 		it('defaults base to cwd property', function(done) {
-			var cwd = path.normalize('/');
-			var file = new File({ cwd: cwd });
+			let cwd = path.normalize('/');
+			let file = new File({ cwd });
 			expect(file.base).toEqual(cwd);
 			done();
 		});
 
 		it('defaults path to null', function(done) {
-			var file = new File();
+			let file = new File();
 			expect(file.path).toNotExist();
 			expect(file.path).toEqual(null);
 			done();
 		});
 
 		it('defaults history to an empty array', function(done) {
-			var file = new File();
+			let file = new File();
 			expect(file.history).toEqual([]);
 			done();
 		});
 
 		it('defaults stat to null', function(done) {
-			var file = new File();
+			let file = new File();
 			expect(file.stat).toNotExist();
 			expect(file.stat).toEqual(null);
 			done();
 		});
 
 		it('defaults contents to null', function(done) {
-			var file = new File();
+			let file = new File();
 			expect(file.contents).toNotExist();
 			expect(file.contents).toEqual(null);
 			done();
@@ -136,109 +136,109 @@ describe('File', function() {
 
 	describe('constructor()', function() {
 		it('sets base', function(done) {
-			var val = path.normalize('/');
-			var file = new File({ base: val });
+			let val = path.normalize('/');
+			let file = new File({ base: val });
 			expect(file.base).toEqual(val);
 			done();
 		});
 
 		it('sets cwd', function(done) {
-			var val = path.normalize('/');
-			var file = new File({ cwd: val });
+			let val = path.normalize('/');
+			let file = new File({ cwd: val });
 			expect(file.cwd).toEqual(val);
 			done();
 		});
 
 		it('sets path (and history)', function(done) {
-			var val = path.normalize('/test.coffee');
-			var file = new File({ path: val });
+			let val = path.normalize('/test.coffee');
+			let file = new File({ path: val });
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual([val]);
 			done();
 		});
 
 		it('sets history (and path)', function(done) {
-			var val = path.normalize('/test.coffee');
-			var file = new File({ history: [val] });
+			let val = path.normalize('/test.coffee');
+			let file = new File({ history: [val] });
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual([val]);
 			done();
 		});
 
 		it('sets stat', function(done) {
-			var val = {};
-			var file = new File({ stat: val as any as fs.Stats });
+			let val = {};
+			let file = new File({ stat: val as any as fs.Stats });
 			expect(file.stat).toEqual(val);
 			done();
 		});
 
 		it('sets contents', function(done) {
-			var val = new Buffer('test');
-			var file = new File({ contents: val });
+			let val = new Buffer('test');
+			let file = new File({ contents: val });
 			expect(file.contents).toEqual(val);
 			done();
 		});
 
 		it('sets custom properties', function(done) {
-			var sourceMap = {};
-			var file = new File({ sourceMap: sourceMap }) as TestFile;
+			let sourceMap = {};
+			let file = new File({ sourceMap }) as TestFile;
 			expect(file.sourceMap).toEqual(sourceMap);
 			done();
 		});
 
 		it('normalizes path', function(done) {
-			var val = '/test/foo/../test.coffee';
-			var expected = path.normalize(val);
-			var file = new File({ path: val });
+			let val = '/test/foo/../test.coffee';
+			let expected = path.normalize(val);
+			let file = new File({ path: val });
 			expect(file.path).toEqual(expected);
 			expect(file.history).toEqual([expected]);
 			done();
 		});
 
 		it('normalizes and removes trailing separator from path', function(done) {
-			var val = '/test/foo/../foo/';
-			var expected = path.normalize(val.slice(0, -1));
-			var file = new File({ path: val });
+			let val = '/test/foo/../foo/';
+			let expected = path.normalize(val.slice(0, -1));
+			let file = new File({ path: val });
 			expect(file.path).toEqual(expected);
 			done();
 		});
 
 		it('normalizes history', function(done) {
-			var val = [
+			let val = [
 				'/test/bar/../bar/test.coffee',
 				'/test/foo/../test.coffee',
 			];
-			var expected = val.map(function(p) {
+			let expected = val.map(function(p) {
 				return path.normalize(p);
 			});
-			var file = new File({ history: val });
+			let file = new File({ history: val });
 			expect(file.path).toEqual(expected[1]);
 			expect(file.history).toEqual(expected);
 			done();
 		});
 
 		it('normalizes and removes trailing separator from history', function(done) {
-			var val = [
+			let val = [
 				'/test/foo/../foo/',
 				'/test/bar/../bar/',
 			];
-			var expected = val.map(function(p) {
+			let expected = val.map(function(p) {
 				return path.normalize(p.slice(0, -1));
 			});
-			var file = new File({ history: val });
+			let file = new File({ history: val });
 			expect(file.history).toEqual(expected);
 			done();
 		});
 
 		it('appends path to history if both exist and different from last', function(done) {
-			var val = path.normalize('/test/baz/test.coffee');
-			var history = [
+			let val = path.normalize('/test/baz/test.coffee');
+			let history = [
 				path.normalize('/test/bar/test.coffee'),
 				path.normalize('/test/foo/test.coffee'),
 			];
-			var file = new File({ path: val, history: history });
+			let file = new File({ path: val, history });
 
-			var expectedHistory = history.concat(val);
+			let expectedHistory = history.concat(val);
 
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual(expectedHistory);
@@ -246,13 +246,13 @@ describe('File', function() {
 		});
 
 		it('does not append path to history if both exist and same as last', function(done) {
-			var val = path.normalize('/test/baz/test.coffee');
-			var history = [
+			let val = path.normalize('/test/baz/test.coffee');
+			let history = [
 				path.normalize('/test/bar/test.coffee'),
 				path.normalize('/test/foo/test.coffee'),
 				val,
 			];
-			var file = new File({ path: val, history: history });
+			let file = new File({ path: val, history });
 
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual(history);
@@ -260,15 +260,15 @@ describe('File', function() {
 		});
 
 		it('does not mutate history array passed in', function(done) {
-			var val = path.normalize('/test/baz/test.coffee');
-			var history = [
+			let val = path.normalize('/test/baz/test.coffee');
+			let history = [
 				path.normalize('/test/bar/test.coffee'),
 				path.normalize('/test/foo/test.coffee'),
 			];
-			var historyCopy = Array.prototype.slice.call(history);
-			var file = new File({ path: val, history: history });
+			let historyCopy = Array.prototype.slice.call(history);
+			let file = new File({ path: val, history });
 
-			var expectedHistory = history.concat(val);
+			let expectedHistory = history.concat(val);
 
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual(expectedHistory);
@@ -279,21 +279,21 @@ describe('File', function() {
 
 	describe('isBuffer()', function() {
 		it('returns true when the contents are a Buffer', function(done) {
-			var val = new Buffer('test');
-			var file = new File({ contents: val });
+			let val = new Buffer('test');
+			let file = new File({ contents: val });
 			expect(file.isBuffer()).toEqual(true);
 			done();
 		});
 
 		it('returns false when the contents are a Stream', function(done) {
-			var val = from([]);
-			var file = new File({ contents: val });
+			let val = from([]);
+			let file = new File({ contents: val });
 			expect(file.isBuffer()).toEqual(false);
 			done();
 		});
 
 		it('returns false when the contents are null', function(done) {
-			var file = new File({ contents: null });
+			let file = new File({ contents: null });
 			expect(file.isBuffer()).toEqual(false);
 			done();
 		});
@@ -301,21 +301,21 @@ describe('File', function() {
 
 	describe('isStream()', function() {
 		it('returns false when the contents are a Buffer', function(done) {
-			var val = new Buffer('test');
-			var file = new File({ contents: val });
+			let val = new Buffer('test');
+			let file = new File({ contents: val });
 			expect(file.isStream()).toEqual(false);
 			done();
 		});
 
 		it('returns true when the contents are a Stream', function(done) {
-			var val = from([]);
-			var file = new File({ contents: val });
+			let val = from([]);
+			let file = new File({ contents: val });
 			expect(file.isStream()).toEqual(true);
 			done();
 		});
 
 		it('returns false when the contents are null', function(done) {
-			var file = new File({ contents: null });
+			let file = new File({ contents: null });
 			expect(file.isStream()).toEqual(false);
 			done();
 		});
@@ -323,101 +323,101 @@ describe('File', function() {
 
 	describe('isNull()', function() {
 		it('returns false when the contents are a Buffer', function(done) {
-			var val = new Buffer('test');
-			var file = new File({ contents: val });
+			let val = new Buffer('test');
+			let file = new File({ contents: val });
 			expect(file.isNull()).toEqual(false);
 			done();
 		});
 
 		it('returns false when the contents are a Stream', function(done) {
-			var val = from([]);
-			var file = new File({ contents: val });
+			let val = from([]);
+			let file = new File({ contents: val });
 			expect(file.isNull()).toEqual(false);
 			done();
 		});
 
 		it('returns true when the contents are null', function(done) {
-			var file = new File({ contents: null });
+			let file = new File({ contents: null });
 			expect(file.isNull()).toEqual(true);
 			done();
 		});
 	});
 
 	describe('isDirectory()', function() {
-		var fakeStat = {
-			isDirectory: function() {
+		let fakeStat = {
+			isDirectory() {
 				return true;
 			},
 		} as any as fs.Stats;
 
 		it('returns false when the contents are a Buffer', function(done) {
-			var val = new Buffer('test');
-			var file = new File({ contents: val, stat: fakeStat });
+			let val = new Buffer('test');
+			let file = new File({ contents: val, stat: fakeStat });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 
 		it('returns false when the contents are a Stream', function(done) {
-			var val = from([]);
-			var file = new File({ contents: val, stat: fakeStat });
+			let val = from([]);
+			let file = new File({ contents: val, stat: fakeStat });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 
 		it('returns true when the contents are null & stat.isDirectory is true', function(done) {
-			var file = new File({ contents: null, stat: fakeStat });
+			let file = new File({ contents: null, stat: fakeStat });
 			expect(file.isDirectory()).toEqual(true);
 			done();
 		});
 
 		it('returns false when stat exists but does not contain an isDirectory method', function(done) {
-			var file = new File({ contents: null, stat: {} as any as fs.Stats });
+			let file = new File({ contents: null, stat: {} as any as fs.Stats });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 
 		it('returns false when stat does not exist', function(done) {
-			var file = new File({ contents: null });
+			let file = new File({ contents: null });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 	});
 
 	describe('isSymbolic()', function() {
-		var fakeStat = {
-			isSymbolicLink: function() {
+		let fakeStat = {
+			isSymbolicLink() {
 				return true;
 			},
 		} as any as fs.Stats;
 
 		it('returns false when the contents are a Buffer', function(done) {
-			var val = new Buffer('test');
-			var file = new File({ contents: val, stat: fakeStat });
+			let val = new Buffer('test');
+			let file = new File({ contents: val, stat: fakeStat });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 
 		it('returns false when the contents are a Stream', function(done) {
-			var val = from([]);
-			var file = new File({ contents: val, stat: fakeStat });
+			let val = from([]);
+			let file = new File({ contents: val, stat: fakeStat });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 
 		it('returns true when the contents are null & stat.isSymbolicLink is true', function(done) {
-			var file = new File({ contents: null, stat: fakeStat });
+			let file = new File({ contents: null, stat: fakeStat });
 			expect(file.isSymbolic()).toEqual(true);
 			done();
 		});
 
 		it('returns false when stat exists but does not contain an isSymbolicLink method', function(done) {
-			var file = new File({ contents: null, stat: {} as any as fs.Stats });
+			let file = new File({ contents: null, stat: {} as any as fs.Stats });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 
 		it('returns false when stat does not exist', function(done) {
-			var file = new File({ contents: null });
+			let file = new File({ contents: null });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
@@ -425,14 +425,14 @@ describe('File', function() {
 
 	describe('clone()', function() {
 		it('copies all attributes over with Buffer contents', function(done) {
-			var options = {
+			let options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: new Buffer('test'),
 			};
-			var file = new File(options);
-			var file2 = file.clone();
+			let file = new File(options);
+			let file2 = file.clone();
 
 			expect(file2).toNotBe(file);
 			expect(file2.cwd).toEqual(file.cwd);
@@ -444,18 +444,18 @@ describe('File', function() {
 		});
 
 		it('assigns Buffer content reference when contents option is false', function(done) {
-			var options = {
+			let options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.js',
 				contents: new Buffer('test'),
 			};
-			var file = new File(options);
+			let file = new File(options);
 
-			var copy1 = file.clone({ contents: false });
+			let copy1 = file.clone({ contents: false });
 			expect(copy1.contents).toBe(file.contents);
 
-			var copy2 = file.clone();
+			let copy2 = file.clone();
 			expect(copy2.contents).toNotBe(file.contents);
 
 			// TypeScript: expected compilation error
@@ -465,14 +465,14 @@ describe('File', function() {
 		});
 
 		it('copies all attributes over with Stream contents', function(done) {
-			var options = {
+			let options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: from(['wa', 'dup']),
 			};
-			var file = new File(options);
-			var file2 = file.clone();
+			let file = new File(options);
+			let file2 = file.clone();
 
 			expect(file2).toNotBe(file);
 			expect(file2.cwd).toEqual(file.cwd);
@@ -480,9 +480,9 @@ describe('File', function() {
 			expect(file2.path).toEqual(file.path);
 			expect(file2.contents).toNotBe(file.contents);
 
-			var ends = 2;
-			var data: Buffer;
-			var data2: Buffer;
+			let ends = 2;
+			let data: Buffer;
+			let data2: Buffer;
 
 			function assert(err: any) {
 				if (err) {
@@ -513,18 +513,18 @@ describe('File', function() {
 		});
 
 		it('does not start flowing until all clones flows (data)', function(done) {
-			var options = {
+			let options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: from(['wa', 'dup']),
 			};
-			var file = new File(options);
-			var file2 = file.clone();
-			var ends = 2;
+			let file = new File(options);
+			let file2 = file.clone();
+			let ends = 2;
 
-			var data = '';
-			var data2 = '';
+			let data = '';
+			let data2 = '';
 
 			function assert() {
 				if (--ends === 0) {
@@ -554,16 +554,16 @@ describe('File', function() {
 		});
 
 		it('does not start flowing until all clones flows (readable)', function(done) {
-			var options = {
+			let options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: from(['wa', 'dup']),
 			};
-			var file = new File(options);
-			var file2 = file.clone();
+			let file = new File(options);
+			let file2 = file.clone();
 
-			var data2 = '';
+			let data2 = '';
 
 			function assert(data: Buffer) {
 				expect(data.toString('utf8')).toEqual(data2);
@@ -571,7 +571,7 @@ describe('File', function() {
 
 			// Start flowing file2
 			file2.contents.on('readable', function(this: NodeJS.ReadableStream) {
-				var chunk: string | Buffer;
+				let chunk: string | Buffer;
 				while ((chunk = this.read()) !== null) {
 					data2 += chunk.toString();
 				}
@@ -584,14 +584,14 @@ describe('File', function() {
 		});
 
 		it('copies all attributes over with null contents', function(done) {
-			var options = {
+			let options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: null,
 			};
-			var file = new File(options);
-			var file2 = file.clone();
+			let file = new File(options);
+			let file2 = file.clone();
 
 			expect(file2).toNotBe(file);
 			expect(file2.cwd).toEqual(file.cwd);
@@ -602,7 +602,7 @@ describe('File', function() {
 		});
 
 		it('properly clones the `stat` property', function(done) {
-			var options = {
+			let options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.js',
@@ -610,8 +610,8 @@ describe('File', function() {
 				stat: fs.statSync(__filename),
 			};
 
-			var file = new File(options);
-			var copy = file.clone();
+			let file = new File(options);
+			let copy = file.clone();
 
 			expect(copy.stat).toExist();
 			if (copy.stat != null) {
@@ -624,15 +624,15 @@ describe('File', function() {
 		});
 
 		it('properly clones the `history` property', function(done) {
-			var options = {
+			let options = {
 				cwd: path.normalize('/'),
 				base: path.normalize('/test/'),
 				path: path.normalize('/test/test.js'),
 				contents: new Buffer('test'),
 			};
 
-			var file = new File(options);
-			var copy = file.clone();
+			let file = new File(options);
+			let copy = file.clone();
 
 			expect(copy.history[0]).toEqual(options.path);
 			copy.path = 'lol';
@@ -641,7 +641,7 @@ describe('File', function() {
 		});
 
 		it('copies custom properties', function(done) {
-			var options = {
+			let options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -649,8 +649,8 @@ describe('File', function() {
 				custom: { meta: {} },
 			};
 
-			var file = new File(options) as TestFile;
-			var file2 = file.clone();
+			let file = new File(options) as TestFile;
+			let file2 = file.clone();
 
 			expect(file2).toNotBe(file);
 			expect(file2.cwd).toEqual(file.cwd);
@@ -663,22 +663,22 @@ describe('File', function() {
 		});
 
 		it('copies history', function(done) {
-			var options = {
+			let options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: null,
 			};
-			var history = [
+			let history = [
 				path.normalize('/test/test.coffee'),
 				path.normalize('/test/test.js'),
 				path.normalize('/test/test-938di2s.js'),
 			];
 
-			var file = new File(options);
+			let file = new File(options);
 			file.path = history[1];
 			file.path = history[2];
-			var file2 = file.clone();
+			let file2 = file.clone();
 
 			expect(file2.history).toEqual(history);
 			expect(file2.history).toNotBe(file.history);
@@ -687,7 +687,7 @@ describe('File', function() {
 		});
 
 		it('supports deep & shallow copy of all attributes', function(done) {
-			var options = {
+			let options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -695,33 +695,33 @@ describe('File', function() {
 				custom: { meta: {} },
 			};
 
-			var file = new File(options) as TestFile;
+			let file = new File(options) as TestFile;
 
-			var file2 = file.clone();
+			let file2 = file.clone();
 			expect(file2.custom).toEqual(file.custom);
 			expect(file2.custom).toNotBe(file.custom);
 			expect(file2.custom.meta).toEqual(file.custom.meta);
 			expect(file2.custom.meta).toNotBe(file.custom.meta);
 
-			var file3 = file.clone(true);
+			let file3 = file.clone(true);
 			expect(file3.custom).toEqual(file.custom);
 			expect(file3.custom).toNotBe(file.custom);
 			expect(file3.custom.meta).toEqual(file.custom.meta);
 			expect(file3.custom.meta).toNotBe(file.custom.meta);
 
-			var file4 = file.clone({ deep: true });
+			let file4 = file.clone({ deep: true });
 			expect(file4.custom).toEqual(file.custom);
 			expect(file4.custom).toNotBe(file.custom);
 			expect(file4.custom.meta).toEqual(file.custom.meta);
 			expect(file4.custom.meta).toNotBe(file.custom.meta);
 
-			var file5 = file.clone(false);
+			let file5 = file.clone(false);
 			expect(file5.custom).toEqual(file.custom);
 			expect(file5.custom).toBe(file.custom);
 			expect(file5.custom.meta).toEqual(file.custom.meta);
 			expect(file5.custom.meta).toBe(file.custom.meta);
 
-			var file6 = file.clone({ deep: false });
+			let file6 = file.clone({ deep: false });
 			expect(file6.custom).toEqual(file.custom);
 			expect(file6.custom).toBe(file.custom);
 			expect(file6.custom.meta).toEqual(file.custom.meta);
@@ -749,21 +749,21 @@ describe('File', function() {
 
 	describe('inspect()', function() {
 		it('returns correct format when no contents and no path', function(done) {
-			var file = new File();
+			let file = new File();
 			expect(file.inspect()).toEqual('<File >');
 			done();
 		});
 
 		it('returns correct format when Buffer contents and no path', function(done) {
-			var val = new Buffer('test');
-			var file = new File({ contents: val });
+			let val = new Buffer('test');
+			let file = new File({ contents: val });
 			expect(file.inspect()).toEqual('<File <Buffer 74 65 73 74>>');
 			done();
 		});
 
 		it('returns correct format when Buffer contents and relative path', function(done) {
-			var val = new Buffer('test');
-			var file = new File({
+			let val = new Buffer('test');
+			let file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -774,7 +774,7 @@ describe('File', function() {
 		});
 
 		it('returns correct format when Stream contents and relative path', function(done) {
-			var file = new File({
+			let file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -785,7 +785,7 @@ describe('File', function() {
 		});
 
 		it('returns correct format when null contents and relative path', function(done) {
-			var file = new File({
+			let file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -798,49 +798,49 @@ describe('File', function() {
 
 	describe('contents get/set', function() {
 		it('returns _contents', function(done) {
-			var val = new Buffer('test');
-			var file = new File() as TestFile;
+			let val = new Buffer('test');
+			let file = new File() as TestFile;
 			file._contents = val;
 			expect(file.contents).toEqual(val);
 			done();
 		});
 
 		it('sets _contents', function(done) {
-			var val = new Buffer('test');
-			var file = new File() as TestFile;
+			let val = new Buffer('test');
+			let file = new File() as TestFile;
 			file.contents = val;
 			expect(file._contents).toEqual(val);
 			done();
 		});
 
 		it('sets a Buffer', function(done) {
-			var val = new Buffer('test');
-			var file = new File();
+			let val = new Buffer('test');
+			let file = new File();
 			file.contents = val;
 			expect(file.contents).toEqual(val);
 			done();
 		});
 
 		it('wraps Stream in Cloneable', function(done) {
-			var val = from([]);
-			var file = new File();
+			let val = from([]);
+			let file = new File();
 			file.contents = val;
 			expect(isCloneable(file.contents)).toEqual(true);
 			done();
 		});
 
 		it('does not double wrap a Cloneable', function(done) {
-			var val = from([]);
-			var clone = cloneable(val);
-			var file = new File();
+			let val = from([]);
+			let clone = cloneable(val);
+			let file = new File();
 			file.contents = clone;
 			expect((file.contents as any)._original).toBe(val);
 			done();
 		});
 
 		it('sets null', function(done) {
-			var val = null;
-			var file = new File();
+			let val = null;
+			let file = new File();
 			file.contents = val;
 			expect(file.contents).toEqual(null);
 			done();
@@ -860,32 +860,32 @@ describe('File', function() {
 
 	describe('cwd get/set', function() {
 		it('returns _cwd', function(done) {
-			var val = '/test';
-			var file = new File() as TestFile;
+			let val = '/test';
+			let file = new File() as TestFile;
 			file._cwd = val;
 			expect(file.cwd).toEqual(val);
 			done();
 		});
 
 		it('sets _cwd', function(done) {
-			var val = '/test';
-			var file = new File() as TestFile;
+			let val = '/test';
+			let file = new File() as TestFile;
 			file.cwd = val;
 			expect(file._cwd).toEqual(path.normalize(val));
 			done();
 		});
 
 		it('normalizes and removes trailing separator on set', function(done) {
-			var val = '/test/foo/../foo/';
-			var expected = path.normalize(val.slice(0, -1));
-			var file = new File();
+			let val = '/test/foo/../foo/';
+			let expected = path.normalize(val.slice(0, -1));
+			let file = new File();
 
 			file.cwd = val;
 
 			expect(file.cwd).toEqual(expected);
 
-			var val2 = '\\test\\foo\\..\\foo\\';
-			var expected2 = path.normalize(isWin ? val2.slice(0, -1) : val2);
+			let val2 = '\\test\\foo\\..\\foo\\';
+			let expected2 = path.normalize(isWin ? val2.slice(0, -1) : val2);
 
 			file.cwd = val2;
 
@@ -922,20 +922,20 @@ describe('File', function() {
 
 	describe('base get/set', function() {
 		it('proxies cwd when omitted', function(done) {
-			var file = new File({ cwd: '/test' });
+			let file = new File({ cwd: '/test' });
 			expect(file.base).toEqual(file.cwd);
 			done();
 		});
 
 		it('proxies cwd when same', function(done) {
-			var file = new File({
+			let file = new File({
 				cwd: '/test',
 				base: '/test',
 			});
 			file.cwd = '/foo/';
 			expect(file.base).toEqual(file.cwd);
 
-			var file2 = new File({
+			let file2 = new File({
 				cwd: '/test',
 			});
 			file2.base = '/test/';
@@ -961,32 +961,32 @@ describe('File', function() {
 		// });
 
 		it('returns _base', function(done) {
-			var val = '/test/';
-			var file = new File() as TestFile;
+			let val = '/test/';
+			let file = new File() as TestFile;
 			file._base = val;
 			expect(file.base).toEqual(val);
 			done();
 		});
 
 		it('sets _base', function(done) {
-			var val = '/test/foo';
-			var file = new File() as TestFile;
+			let val = '/test/foo';
+			let file = new File() as TestFile;
 			file.base = val;
 			expect(file._base).toEqual(path.normalize(val));
 			done();
 		});
 
 		it('normalizes and removes trailing separator on set', function(done) {
-			var val = '/test/foo/../foo/';
-			var expected = path.normalize(val.slice(0, -1));
-			var file = new File();
+			let val = '/test/foo/../foo/';
+			let expected = path.normalize(val.slice(0, -1));
+			let file = new File();
 
 			file.base = val;
 
 			expect(file.base).toEqual(expected);
 
-			var val2 = '\\test\\foo\\..\\foo\\';
-			var expected2 = path.normalize(isWin ? val2.slice(0, -1) : val2);
+			let val2 = '\\test\\foo\\..\\foo\\';
+			let expected2 = path.normalize(isWin ? val2.slice(0, -1) : val2);
 
 			file.base = val2;
 
@@ -1022,7 +1022,7 @@ describe('File', function() {
 
 	describe('relative get/set', function() {
 		it('throws on set', function(done) {
-			var file = new File();
+			let file = new File();
 
 			function invalid() {
 				file.relative = 'test';
@@ -1033,7 +1033,7 @@ describe('File', function() {
 		});
 
 		it('throws on get with no path', function(done) {
-			var file = new File();
+			let file = new File();
 
 			function invalid() {
 				file.relative;
@@ -1044,7 +1044,7 @@ describe('File', function() {
 		});
 
 		it('returns a relative path from base', function(done) {
-			var file = new File({
+			let file = new File({
 				base: '/test/',
 				path: '/test/test.coffee',
 			});
@@ -1054,7 +1054,7 @@ describe('File', function() {
 		});
 
 		it('returns a relative path from cwd', function(done) {
-			var file = new File({
+			let file = new File({
 				cwd: '/',
 				path: '/test/test.coffee',
 			});
@@ -1064,11 +1064,11 @@ describe('File', function() {
 		});
 
 		it('does not append separator when directory', function(done) {
-			var file = new File({
+			let file = new File({
 				base: '/test',
 				path: '/test/foo/bar',
 				stat: {
-					isDirectory: function() {
+					isDirectory() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1079,11 +1079,11 @@ describe('File', function() {
 		});
 
 		it('does not append separator when symlink', function(done) {
-			var file = new File({
+			let file = new File({
 				base: '/test',
 				path: '/test/foo/bar',
 				stat: {
-					isSymbolicLink: function() {
+					isSymbolicLink() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1094,14 +1094,14 @@ describe('File', function() {
 		});
 
 		it('does not append separator when directory & symlink', function(done) {
-			var file = new File({
+			let file = new File({
 				base: '/test',
 				path: '/test/foo/bar',
 				stat: {
-					isDirectory: function() {
+					isDirectory() {
 						return true;
 					},
-					isSymbolicLink: function() {
+					isSymbolicLink() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1114,7 +1114,7 @@ describe('File', function() {
 
 	describe('dirname get/set', function() {
 		it('throws on get with no path', function(done) {
-			var file = new File();
+			let file = new File();
 
 			function invalid() {
 				file.dirname;
@@ -1125,7 +1125,7 @@ describe('File', function() {
 		});
 
 		it('returns the dirname without trailing separator', function(done) {
-			var file = new File({
+			let file = new File({
 				cwd: '/',
 				base: '/test',
 				path: '/test/test.coffee',
@@ -1136,7 +1136,7 @@ describe('File', function() {
 		});
 
 		it('throws on set with no path', function(done) {
-			var file = new File();
+			let file = new File();
 
 			function invalid() {
 				file.dirname = '/test';
@@ -1147,7 +1147,7 @@ describe('File', function() {
 		});
 
 		it('replaces the dirname of the path', function(done) {
-			var file = new File({
+			let file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1161,7 +1161,7 @@ describe('File', function() {
 
 	describe('basename get/set', function() {
 		it('throws on get with no path', function(done) {
-			var file = new File();
+			let file = new File();
 
 			function invalid() {
 				return file.basename;
@@ -1172,7 +1172,7 @@ describe('File', function() {
 		});
 
 		it('returns the basename of the path', function(done) {
-			var file = new File({
+			let file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1183,10 +1183,10 @@ describe('File', function() {
 		});
 
 		it('does not append trailing separator when directory', function(done) {
-			var file = new File({
+			let file = new File({
 				path: '/test/foo',
 				stat: {
-					isDirectory: function() {
+					isDirectory() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1197,10 +1197,10 @@ describe('File', function() {
 		});
 
 		it('does not append trailing separator when symlink', function(done) {
-			var file = new File({
+			let file = new File({
 				path: '/test/foo',
 				stat: {
-					isSymbolicLink: function() {
+					isSymbolicLink() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1211,13 +1211,13 @@ describe('File', function() {
 		});
 
 		it('does not append trailing separator when directory & symlink', function(done) {
-			var file = new File({
+			let file = new File({
 				path: '/test/foo',
 				stat: {
-					isDirectory: function() {
+					isDirectory() {
 						return true;
 					},
-					isSymbolicLink: function() {
+					isSymbolicLink() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1228,7 +1228,7 @@ describe('File', function() {
 		});
 
 		it('removes trailing separator', function(done) {
-			var file = new File({
+			let file = new File({
 				path: '/test/foo/',
 			});
 
@@ -1237,10 +1237,10 @@ describe('File', function() {
 		});
 
 		it('removes trailing separator when directory', function(done) {
-			var file = new File({
+			let file = new File({
 				path: '/test/foo/',
 				stat: {
-					isDirectory: function() {
+					isDirectory() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1251,10 +1251,10 @@ describe('File', function() {
 		});
 
 		it('removes trailing separator when symlink', function(done) {
-			var file = new File({
+			let file = new File({
 				path: '/test/foo/',
 				stat: {
-					isSymbolicLink: function() {
+					isSymbolicLink() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1265,13 +1265,13 @@ describe('File', function() {
 		});
 
 		it('removes trailing separator when directory & symlink', function(done) {
-			var file = new File({
+			let file = new File({
 				path: '/test/foo/',
 				stat: {
-					isDirectory: function() {
+					isDirectory() {
 						return true;
 					},
-					isSymbolicLink: function() {
+					isSymbolicLink() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1282,7 +1282,7 @@ describe('File', function() {
 		});
 
 		it('throws on set with no path', function(done) {
-			var file = new File();
+			let file = new File();
 
 			function invalid() {
 				file.basename = 'test.coffee';
@@ -1293,7 +1293,7 @@ describe('File', function() {
 		});
 
 		it('replaces the basename of the path', function(done) {
-			var file = new File({
+			let file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1307,7 +1307,7 @@ describe('File', function() {
 
 	describe('stem get/set', function() {
 		it('throws on get with no path', function(done) {
-			var file = new File();
+			let file = new File();
 
 			function invalid() {
 				file.stem;
@@ -1318,7 +1318,7 @@ describe('File', function() {
 		});
 
 		it('returns the stem of the path', function(done) {
-			var file = new File({
+			let file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1329,7 +1329,7 @@ describe('File', function() {
 		});
 
 		it('throws on set with no path', function(done) {
-			var file = new File();
+			let file = new File();
 
 			function invalid() {
 				file.stem = 'test.coffee';
@@ -1340,7 +1340,7 @@ describe('File', function() {
 		});
 
 		it('replaces the stem of the path', function(done) {
-			var file = new File({
+			let file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1354,7 +1354,7 @@ describe('File', function() {
 
 	describe('extname get/set', function() {
 		it('throws on get with no path', function(done) {
-			var file = new File();
+			let file = new File();
 
 			function invalid() {
 				file.extname;
@@ -1365,7 +1365,7 @@ describe('File', function() {
 		});
 
 		it('returns the extname of the path', function(done) {
-			var file = new File({
+			let file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1376,7 +1376,7 @@ describe('File', function() {
 		});
 
 		it('throws on set with no path', function(done) {
-			var file = new File();
+			let file = new File();
 
 			function invalid() {
 				file.extname = '.coffee';
@@ -1387,7 +1387,7 @@ describe('File', function() {
 		});
 
 		it('replaces the extname of the path', function(done) {
-			var file = new File({
+			let file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1401,11 +1401,11 @@ describe('File', function() {
 
 	describe('path get/set', function() {
 		it('records path in history upon instantiation', function(done) {
-			var file = new File({
+			let file = new File({
 				cwd: '/',
 				path: '/test/test.coffee',
 			});
-			var history = [
+			let history = [
 				path.normalize('/test/test.coffee'),
 			];
 
@@ -1415,12 +1415,12 @@ describe('File', function() {
 		});
 
 		it('records path in history when set', function(done) {
-			var val = path.normalize('/test/test.js');
-			var file = new File({
+			let val = path.normalize('/test/test.js');
+			let file = new File({
 				cwd: '/',
 				path: '/test/test.coffee',
 			});
-			var history = [
+			let history = [
 				path.normalize('/test/test.coffee'),
 				val,
 			];
@@ -1429,7 +1429,7 @@ describe('File', function() {
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual(history);
 
-			var val2 = path.normalize('/test/test.es6');
+			let val2 = path.normalize('/test/test.es6');
 			history.push(val2);
 
 			file.path = val2;
@@ -1439,12 +1439,12 @@ describe('File', function() {
 		});
 
 		it('does not record path in history when set to the current path', function(done) {
-			var val = path.normalize('/test/test.coffee');
-			var file = new File({
+			let val = path.normalize('/test/test.coffee');
+			let file = new File({
 				cwd: '/',
 				path: val,
 			});
-			var history = [
+			let history = [
 				val,
 			];
 
@@ -1456,12 +1456,12 @@ describe('File', function() {
 		});
 
 		it('does not record path in history when set to empty string', function(done) {
-			var val = path.normalize('/test/test.coffee');
-			var file = new File({
+			let val = path.normalize('/test/test.coffee');
+			let file = new File({
 				cwd: '/',
 				path: val,
 			});
-			var history = [
+			let history = [
 				val,
 			];
 
@@ -1487,9 +1487,9 @@ describe('File', function() {
 		// });
 
 		it('normalizes the path upon set', function(done) {
-			var val = '/test/foo/../test.coffee';
-			var expected = path.normalize(val);
-			var file = new File();
+			let val = '/test/foo/../test.coffee';
+			let expected = path.normalize(val);
+			let file = new File();
 
 			file.path = val;
 
@@ -1499,7 +1499,7 @@ describe('File', function() {
 		});
 
 		it('removes the trailing separator upon set', function(done) {
-			var file = new File();
+			let file = new File();
 			file.path = '/test/';
 
 			expect(file.path).toEqual(path.normalize('/test'));
@@ -1508,9 +1508,9 @@ describe('File', function() {
 		});
 
 		it('removes the trailing separator upon set when directory', function(done) {
-			var file = new File({
+			let file = new File({
 				stat: {
-					isDirectory: function() {
+					isDirectory() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1523,9 +1523,9 @@ describe('File', function() {
 		});
 
 		it('removes the trailing separator upon set when symlink', function(done) {
-			var file = new File({
+			let file = new File({
 				stat: {
-					isSymbolicLink: function() {
+					isSymbolicLink() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1538,12 +1538,12 @@ describe('File', function() {
 		});
 
 		it('removes the trailing separator upon set when directory & symlink', function(done) {
-			var file = new File({
+			let file = new File({
 				stat: {
-					isDirectory: function() {
+					isDirectory() {
 						return true;
 					},
-					isSymbolicLink: function() {
+					isSymbolicLink() {
 						return true;
 					},
 				} as any as fs.Stats,
@@ -1558,15 +1558,15 @@ describe('File', function() {
 
 	describe('symlink get/set', function() {
 		it('return null on get with no symlink', function(done) {
-			var file = new File();
+			let file = new File();
 
 			expect(file.symlink).toEqual(null);
 			done();
 		});
 
 		it('returns _symlink', function(done) {
-			var val = '/test/test.coffee';
-			var file = new File() as TestFile;
+			let val = '/test/test.coffee';
+			let file = new File() as TestFile;
 			file._symlink = val;
 
 			expect(file.symlink).toEqual(val);
@@ -1574,7 +1574,7 @@ describe('File', function() {
 		});
 
 		it('throws on set with non-string', function(done) {
-			var file = new File();
+			let file = new File();
 
 			function invalid() {
 				file.symlink = null;
@@ -1585,9 +1585,9 @@ describe('File', function() {
 		});
 
 		it('sets _symlink', function(done) {
-			var val = '/test/test.coffee';
-			var expected = path.normalize(val);
-			var file = new File() as TestFile;
+			let val = '/test/test.coffee';
+			let expected = path.normalize(val);
+			let file = new File() as TestFile;
 			file.symlink = val;
 
 			expect(file._symlink).toEqual(expected);
@@ -1595,8 +1595,8 @@ describe('File', function() {
 		});
 
 		it('allows relative symlink', function(done) {
-			var val = 'test.coffee';
-			var file = new File();
+			let val = 'test.coffee';
+			let file = new File();
 			file.symlink = val;
 
 			expect(file.symlink).toEqual(val);
@@ -1604,9 +1604,9 @@ describe('File', function() {
 		});
 
 		it('normalizes and removes trailing separator upon set', function(done) {
-			var val = '/test/foo/../bar/';
-			var expected = path.normalize(val.slice(0, -1));
-			var file = new File();
+			let val = '/test/foo/../bar/';
+			let expected = path.normalize(val.slice(0, -1));
+			let file = new File();
 			file.symlink = val;
 
 			expect(file.symlink).toEqual(expected);

From 73009cc2d0d42b003c516b9f93d7833e024efa89 Mon Sep 17 00:00:00 2001
From: segayuu <segayuu@gmail.com>
Date: Fri, 15 Dec 2017 10:26:43 +0900
Subject: [PATCH 4/8] cleanup ignore lint error: dt-header

---
 types/vinyl/index.d.ts  | 2 +-
 types/vinyl/tslint.json | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/vinyl/index.d.ts b/types/vinyl/index.d.ts
index 5239147517..c62007372e 100644
--- a/types/vinyl/index.d.ts
+++ b/types/vinyl/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for vinyl 2.0.0
+// Type definitions for vinyl 2.0
 // Project: https://github.com/gulpjs/vinyl
 // Definitions by: vvakame <https://github.com/vvakame>, jedmao <https://github.com/jedmao>, Georgii Dolzhykov <https://github.com/thorn0>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/vinyl/tslint.json b/types/vinyl/tslint.json
index 4c5f80b2f4..7f4748eed0 100644
--- a/types/vinyl/tslint.json
+++ b/types/vinyl/tslint.json
@@ -1,7 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "dt-header": false,
         "no-conditional-assignment": false,
         "no-construct": false,
         "no-var-requires": false,

From e54a57b93c856a76f1ad04a9bac323e2fac065de Mon Sep 17 00:00:00 2001
From: segayuu <segayuu@gmail.com>
Date: Fri, 15 Dec 2017 10:31:16 +0900
Subject: [PATCH 5/8] cleanup ignore lint error: only-arrow-functions

---
 types/vinyl/tslint.json    |   1 -
 types/vinyl/vinyl-tests.ts | 304 ++++++++++++++++++-------------------
 2 files changed, 152 insertions(+), 153 deletions(-)

diff --git a/types/vinyl/tslint.json b/types/vinyl/tslint.json
index 7f4748eed0..c8b1832546 100644
--- a/types/vinyl/tslint.json
+++ b/types/vinyl/tslint.json
@@ -4,7 +4,6 @@
         "no-conditional-assignment": false,
         "no-construct": false,
         "no-var-requires": false,
-        "only-arrow-functions": false,
         "prefer-const": false
     }
 }
diff --git a/types/vinyl/vinyl-tests.ts b/types/vinyl/vinyl-tests.ts
index 079588a4e7..b3f3be868f 100644
--- a/types/vinyl/vinyl-tests.ts
+++ b/types/vinyl/vinyl-tests.ts
@@ -31,46 +31,46 @@ let isCloneable: (obj: any) => boolean = cloneable.isCloneable;
 
 let isWin = (process.platform === 'win32');
 
-describe('File', function() {
-	describe('isVinyl()', function() {
-		it('returns true for a Vinyl object', function(done) {
+describe('File', () => {
+	describe('isVinyl()', () => {
+		it('returns true for a Vinyl object', done => {
 			let file = new File();
 			let result = File.isVinyl(file);
 			expect(result).toEqual(true);
 			done();
 		});
 
-		it('returns false for a normal object', function(done) {
+		it('returns false for a normal object', done => {
 			let result = File.isVinyl({});
 			expect(result).toEqual(false);
 			done();
 		});
 
-		it('returns false for null', function(done) {
+		it('returns false for null', done => {
 			let result = File.isVinyl(null);
 			expect(result).toEqual(false);
 			done();
 		});
 
-		it('returns false for a string', function(done) {
+		it('returns false for a string', done => {
 			let result = File.isVinyl('foobar');
 			expect(result).toEqual(false);
 			done();
 		});
 
-		it('returns false for a String object', function(done) {
+		it('returns false for a String object', done => {
 			let result = File.isVinyl(new String('foobar'));
 			expect(result).toEqual(false);
 			done();
 		});
 
-		it('returns false for a number', function(done) {
+		it('returns false for a number', done => {
 			let result = File.isVinyl(1);
 			expect(result).toEqual(false);
 			done();
 		});
 
-		it('returns false for a Number object', function(done) {
+		it('returns false for a Number object', done => {
 			let result = File.isVinyl(new Number(1));
 			expect(result).toEqual(false);
 			done();
@@ -79,54 +79,54 @@ describe('File', function() {
 		// This is based on current implementation
 		// A test was added to document and make aware during internal changes
 		// TODO: decide if this should be leak-able
-		it('returns true for a mocked object', function(done) {
+		it('returns true for a mocked object', done => {
 			let result = File.isVinyl({ _isVinyl: true });
 			expect(result).toEqual(true);
 			done();
 		});
 	});
 
-	describe('defaults', function() {
-		it('defaults cwd to process.cwd', function(done) {
+	describe('defaults', () => {
+		it('defaults cwd to process.cwd', done => {
 			let file = new File();
 			expect(file.cwd).toEqual(process.cwd());
 			done();
 		});
 
-		it('defaults base to process.cwd', function(done) {
+		it('defaults base to process.cwd', done => {
 			let file = new File();
 			expect(file.base).toEqual(process.cwd());
 			done();
 		});
 
-		it('defaults base to cwd property', function(done) {
+		it('defaults base to cwd property', done => {
 			let cwd = path.normalize('/');
 			let file = new File({ cwd });
 			expect(file.base).toEqual(cwd);
 			done();
 		});
 
-		it('defaults path to null', function(done) {
+		it('defaults path to null', done => {
 			let file = new File();
 			expect(file.path).toNotExist();
 			expect(file.path).toEqual(null);
 			done();
 		});
 
-		it('defaults history to an empty array', function(done) {
+		it('defaults history to an empty array', done => {
 			let file = new File();
 			expect(file.history).toEqual([]);
 			done();
 		});
 
-		it('defaults stat to null', function(done) {
+		it('defaults stat to null', done => {
 			let file = new File();
 			expect(file.stat).toNotExist();
 			expect(file.stat).toEqual(null);
 			done();
 		});
 
-		it('defaults contents to null', function(done) {
+		it('defaults contents to null', done => {
 			let file = new File();
 			expect(file.contents).toNotExist();
 			expect(file.contents).toEqual(null);
@@ -134,22 +134,22 @@ describe('File', function() {
 		});
 	});
 
-	describe('constructor()', function() {
-		it('sets base', function(done) {
+	describe('constructor()', () => {
+		it('sets base', done => {
 			let val = path.normalize('/');
 			let file = new File({ base: val });
 			expect(file.base).toEqual(val);
 			done();
 		});
 
-		it('sets cwd', function(done) {
+		it('sets cwd', done => {
 			let val = path.normalize('/');
 			let file = new File({ cwd: val });
 			expect(file.cwd).toEqual(val);
 			done();
 		});
 
-		it('sets path (and history)', function(done) {
+		it('sets path (and history)', done => {
 			let val = path.normalize('/test.coffee');
 			let file = new File({ path: val });
 			expect(file.path).toEqual(val);
@@ -157,7 +157,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('sets history (and path)', function(done) {
+		it('sets history (and path)', done => {
 			let val = path.normalize('/test.coffee');
 			let file = new File({ history: [val] });
 			expect(file.path).toEqual(val);
@@ -165,28 +165,28 @@ describe('File', function() {
 			done();
 		});
 
-		it('sets stat', function(done) {
+		it('sets stat', done => {
 			let val = {};
 			let file = new File({ stat: val as any as fs.Stats });
 			expect(file.stat).toEqual(val);
 			done();
 		});
 
-		it('sets contents', function(done) {
+		it('sets contents', done => {
 			let val = new Buffer('test');
 			let file = new File({ contents: val });
 			expect(file.contents).toEqual(val);
 			done();
 		});
 
-		it('sets custom properties', function(done) {
+		it('sets custom properties', done => {
 			let sourceMap = {};
 			let file = new File({ sourceMap }) as TestFile;
 			expect(file.sourceMap).toEqual(sourceMap);
 			done();
 		});
 
-		it('normalizes path', function(done) {
+		it('normalizes path', done => {
 			let val = '/test/foo/../test.coffee';
 			let expected = path.normalize(val);
 			let file = new File({ path: val });
@@ -195,7 +195,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('normalizes and removes trailing separator from path', function(done) {
+		it('normalizes and removes trailing separator from path', done => {
 			let val = '/test/foo/../foo/';
 			let expected = path.normalize(val.slice(0, -1));
 			let file = new File({ path: val });
@@ -203,12 +203,12 @@ describe('File', function() {
 			done();
 		});
 
-		it('normalizes history', function(done) {
+		it('normalizes history', done => {
 			let val = [
 				'/test/bar/../bar/test.coffee',
 				'/test/foo/../test.coffee',
 			];
-			let expected = val.map(function(p) {
+			let expected = val.map(p => {
 				return path.normalize(p);
 			});
 			let file = new File({ history: val });
@@ -217,12 +217,12 @@ describe('File', function() {
 			done();
 		});
 
-		it('normalizes and removes trailing separator from history', function(done) {
+		it('normalizes and removes trailing separator from history', done => {
 			let val = [
 				'/test/foo/../foo/',
 				'/test/bar/../bar/',
 			];
-			let expected = val.map(function(p) {
+			let expected = val.map(p => {
 				return path.normalize(p.slice(0, -1));
 			});
 			let file = new File({ history: val });
@@ -230,7 +230,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('appends path to history if both exist and different from last', function(done) {
+		it('appends path to history if both exist and different from last', done => {
 			let val = path.normalize('/test/baz/test.coffee');
 			let history = [
 				path.normalize('/test/bar/test.coffee'),
@@ -245,7 +245,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('does not append path to history if both exist and same as last', function(done) {
+		it('does not append path to history if both exist and same as last', done => {
 			let val = path.normalize('/test/baz/test.coffee');
 			let history = [
 				path.normalize('/test/bar/test.coffee'),
@@ -259,7 +259,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('does not mutate history array passed in', function(done) {
+		it('does not mutate history array passed in', done => {
 			let val = path.normalize('/test/baz/test.coffee');
 			let history = [
 				path.normalize('/test/bar/test.coffee'),
@@ -277,154 +277,154 @@ describe('File', function() {
 		});
 	});
 
-	describe('isBuffer()', function() {
-		it('returns true when the contents are a Buffer', function(done) {
+	describe('isBuffer()', () => {
+		it('returns true when the contents are a Buffer', done => {
 			let val = new Buffer('test');
 			let file = new File({ contents: val });
 			expect(file.isBuffer()).toEqual(true);
 			done();
 		});
 
-		it('returns false when the contents are a Stream', function(done) {
+		it('returns false when the contents are a Stream', done => {
 			let val = from([]);
 			let file = new File({ contents: val });
 			expect(file.isBuffer()).toEqual(false);
 			done();
 		});
 
-		it('returns false when the contents are null', function(done) {
+		it('returns false when the contents are null', done => {
 			let file = new File({ contents: null });
 			expect(file.isBuffer()).toEqual(false);
 			done();
 		});
 	});
 
-	describe('isStream()', function() {
-		it('returns false when the contents are a Buffer', function(done) {
+	describe('isStream()', () => {
+		it('returns false when the contents are a Buffer', done => {
 			let val = new Buffer('test');
 			let file = new File({ contents: val });
 			expect(file.isStream()).toEqual(false);
 			done();
 		});
 
-		it('returns true when the contents are a Stream', function(done) {
+		it('returns true when the contents are a Stream', done => {
 			let val = from([]);
 			let file = new File({ contents: val });
 			expect(file.isStream()).toEqual(true);
 			done();
 		});
 
-		it('returns false when the contents are null', function(done) {
+		it('returns false when the contents are null', done => {
 			let file = new File({ contents: null });
 			expect(file.isStream()).toEqual(false);
 			done();
 		});
 	});
 
-	describe('isNull()', function() {
-		it('returns false when the contents are a Buffer', function(done) {
+	describe('isNull()', () => {
+		it('returns false when the contents are a Buffer', done => {
 			let val = new Buffer('test');
 			let file = new File({ contents: val });
 			expect(file.isNull()).toEqual(false);
 			done();
 		});
 
-		it('returns false when the contents are a Stream', function(done) {
+		it('returns false when the contents are a Stream', done => {
 			let val = from([]);
 			let file = new File({ contents: val });
 			expect(file.isNull()).toEqual(false);
 			done();
 		});
 
-		it('returns true when the contents are null', function(done) {
+		it('returns true when the contents are null', done => {
 			let file = new File({ contents: null });
 			expect(file.isNull()).toEqual(true);
 			done();
 		});
 	});
 
-	describe('isDirectory()', function() {
+	describe('isDirectory()', () => {
 		let fakeStat = {
 			isDirectory() {
 				return true;
 			},
 		} as any as fs.Stats;
 
-		it('returns false when the contents are a Buffer', function(done) {
+		it('returns false when the contents are a Buffer', done => {
 			let val = new Buffer('test');
 			let file = new File({ contents: val, stat: fakeStat });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 
-		it('returns false when the contents are a Stream', function(done) {
+		it('returns false when the contents are a Stream', done => {
 			let val = from([]);
 			let file = new File({ contents: val, stat: fakeStat });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 
-		it('returns true when the contents are null & stat.isDirectory is true', function(done) {
+		it('returns true when the contents are null & stat.isDirectory is true', done => {
 			let file = new File({ contents: null, stat: fakeStat });
 			expect(file.isDirectory()).toEqual(true);
 			done();
 		});
 
-		it('returns false when stat exists but does not contain an isDirectory method', function(done) {
+		it('returns false when stat exists but does not contain an isDirectory method', done => {
 			let file = new File({ contents: null, stat: {} as any as fs.Stats });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 
-		it('returns false when stat does not exist', function(done) {
+		it('returns false when stat does not exist', done => {
 			let file = new File({ contents: null });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 	});
 
-	describe('isSymbolic()', function() {
+	describe('isSymbolic()', () => {
 		let fakeStat = {
 			isSymbolicLink() {
 				return true;
 			},
 		} as any as fs.Stats;
 
-		it('returns false when the contents are a Buffer', function(done) {
+		it('returns false when the contents are a Buffer', done => {
 			let val = new Buffer('test');
 			let file = new File({ contents: val, stat: fakeStat });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 
-		it('returns false when the contents are a Stream', function(done) {
+		it('returns false when the contents are a Stream', done => {
 			let val = from([]);
 			let file = new File({ contents: val, stat: fakeStat });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 
-		it('returns true when the contents are null & stat.isSymbolicLink is true', function(done) {
+		it('returns true when the contents are null & stat.isSymbolicLink is true', done => {
 			let file = new File({ contents: null, stat: fakeStat });
 			expect(file.isSymbolic()).toEqual(true);
 			done();
 		});
 
-		it('returns false when stat exists but does not contain an isSymbolicLink method', function(done) {
+		it('returns false when stat exists but does not contain an isSymbolicLink method', done => {
 			let file = new File({ contents: null, stat: {} as any as fs.Stats });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 
-		it('returns false when stat does not exist', function(done) {
+		it('returns false when stat does not exist', done => {
 			let file = new File({ contents: null });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 	});
 
-	describe('clone()', function() {
-		it('copies all attributes over with Buffer contents', function(done) {
+	describe('clone()', () => {
+		it('copies all attributes over with Buffer contents', done => {
 			let options = {
 				cwd: '/',
 				base: '/test/',
@@ -443,7 +443,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('assigns Buffer content reference when contents option is false', function(done) {
+		it('assigns Buffer content reference when contents option is false', done => {
 			let options = {
 				cwd: '/',
 				base: '/test/',
@@ -464,7 +464,7 @@ describe('File', function() {
 			// done();
 		});
 
-		it('copies all attributes over with Stream contents', function(done) {
+		it('copies all attributes over with Stream contents', done => {
 			let options = {
 				cwd: '/',
 				base: '/test/',
@@ -499,20 +499,20 @@ describe('File', function() {
 
 			pipe([
 				file.contents,
-				concat(function(d) {
+				concat(d => {
 					data = d;
 				}),
 			], assert);
 
 			pipe([
 				file2.contents,
-				concat(function(d) {
+				concat(d => {
 					data2 = d;
 				}),
 			], assert);
 		});
 
-		it('does not start flowing until all clones flows (data)', function(done) {
+		it('does not start flowing until all clones flows (data)', done => {
 			let options = {
 				cwd: '/',
 				base: '/test/',
@@ -534,17 +534,17 @@ describe('File', function() {
 			}
 
 			// Start flowing file2
-			file2.contents.on('data', function(chunk: Buffer) {
+			file2.contents.on('data', (chunk: Buffer) => {
 				data2 += chunk.toString('utf8');
 			});
 
-			process.nextTick(function() {
+			process.nextTick(() => {
 				// Nothing was written yet
 				expect(data).toEqual('');
 				expect(data2).toEqual('');
 
 				// Starts flowing file
-				file.contents.on('data', function(chunk: Buffer) {
+				file.contents.on('data', (chunk: Buffer) => {
 					data += chunk.toString('utf8');
 				});
 			});
@@ -553,7 +553,7 @@ describe('File', function() {
 			file.contents.on('end', assert);
 		});
 
-		it('does not start flowing until all clones flows (readable)', function(done) {
+		it('does not start flowing until all clones flows (readable)', done => {
 			let options = {
 				cwd: '/',
 				base: '/test/',
@@ -583,7 +583,7 @@ describe('File', function() {
 			], done);
 		});
 
-		it('copies all attributes over with null contents', function(done) {
+		it('copies all attributes over with null contents', done => {
 			let options = {
 				cwd: '/',
 				base: '/test/',
@@ -601,7 +601,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('properly clones the `stat` property', function(done) {
+		it('properly clones the `stat` property', done => {
 			let options = {
 				cwd: '/',
 				base: '/test/',
@@ -623,7 +623,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('properly clones the `history` property', function(done) {
+		it('properly clones the `history` property', done => {
 			let options = {
 				cwd: path.normalize('/'),
 				base: path.normalize('/test/'),
@@ -640,7 +640,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('copies custom properties', function(done) {
+		it('copies custom properties', done => {
 			let options = {
 				cwd: '/',
 				base: '/test/',
@@ -662,7 +662,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('copies history', function(done) {
+		it('copies history', done => {
 			let options = {
 				cwd: '/',
 				base: '/test/',
@@ -686,7 +686,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('supports deep & shallow copy of all attributes', function(done) {
+		it('supports deep & shallow copy of all attributes', done => {
 			let options = {
 				cwd: '/',
 				base: '/test/',
@@ -747,21 +747,21 @@ describe('File', function() {
 		// });
 	});
 
-	describe('inspect()', function() {
-		it('returns correct format when no contents and no path', function(done) {
+	describe('inspect()', () => {
+		it('returns correct format when no contents and no path', done => {
 			let file = new File();
 			expect(file.inspect()).toEqual('<File >');
 			done();
 		});
 
-		it('returns correct format when Buffer contents and no path', function(done) {
+		it('returns correct format when Buffer contents and no path', done => {
 			let val = new Buffer('test');
 			let file = new File({ contents: val });
 			expect(file.inspect()).toEqual('<File <Buffer 74 65 73 74>>');
 			done();
 		});
 
-		it('returns correct format when Buffer contents and relative path', function(done) {
+		it('returns correct format when Buffer contents and relative path', done => {
 			let val = new Buffer('test');
 			let file = new File({
 				cwd: '/',
@@ -773,7 +773,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('returns correct format when Stream contents and relative path', function(done) {
+		it('returns correct format when Stream contents and relative path', done => {
 			let file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -784,7 +784,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('returns correct format when null contents and relative path', function(done) {
+		it('returns correct format when null contents and relative path', done => {
 			let file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -796,8 +796,8 @@ describe('File', function() {
 		});
 	});
 
-	describe('contents get/set', function() {
-		it('returns _contents', function(done) {
+	describe('contents get/set', () => {
+		it('returns _contents', done => {
 			let val = new Buffer('test');
 			let file = new File() as TestFile;
 			file._contents = val;
@@ -805,7 +805,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('sets _contents', function(done) {
+		it('sets _contents', done => {
 			let val = new Buffer('test');
 			let file = new File() as TestFile;
 			file.contents = val;
@@ -813,7 +813,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('sets a Buffer', function(done) {
+		it('sets a Buffer', done => {
 			let val = new Buffer('test');
 			let file = new File();
 			file.contents = val;
@@ -821,7 +821,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('wraps Stream in Cloneable', function(done) {
+		it('wraps Stream in Cloneable', done => {
 			let val = from([]);
 			let file = new File();
 			file.contents = val;
@@ -829,7 +829,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('does not double wrap a Cloneable', function(done) {
+		it('does not double wrap a Cloneable', done => {
 			let val = from([]);
 			let clone = cloneable(val);
 			let file = new File();
@@ -838,7 +838,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('sets null', function(done) {
+		it('sets null', done => {
 			let val = null;
 			let file = new File();
 			file.contents = val;
@@ -858,8 +858,8 @@ describe('File', function() {
 		// });
 	});
 
-	describe('cwd get/set', function() {
-		it('returns _cwd', function(done) {
+	describe('cwd get/set', () => {
+		it('returns _cwd', done => {
 			let val = '/test';
 			let file = new File() as TestFile;
 			file._cwd = val;
@@ -867,7 +867,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('sets _cwd', function(done) {
+		it('sets _cwd', done => {
 			let val = '/test';
 			let file = new File() as TestFile;
 			file.cwd = val;
@@ -875,7 +875,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('normalizes and removes trailing separator on set', function(done) {
+		it('normalizes and removes trailing separator on set', done => {
 			let val = '/test/foo/../foo/';
 			let expected = path.normalize(val.slice(0, -1));
 			let file = new File();
@@ -920,14 +920,14 @@ describe('File', function() {
 		// });
 	});
 
-	describe('base get/set', function() {
-		it('proxies cwd when omitted', function(done) {
+	describe('base get/set', () => {
+		it('proxies cwd when omitted', done => {
 			let file = new File({ cwd: '/test' });
 			expect(file.base).toEqual(file.cwd);
 			done();
 		});
 
-		it('proxies cwd when same', function(done) {
+		it('proxies cwd when same', done => {
 			let file = new File({
 				cwd: '/test',
 				base: '/test',
@@ -960,7 +960,7 @@ describe('File', function() {
 		// 	done();
 		// });
 
-		it('returns _base', function(done) {
+		it('returns _base', done => {
 			let val = '/test/';
 			let file = new File() as TestFile;
 			file._base = val;
@@ -968,7 +968,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('sets _base', function(done) {
+		it('sets _base', done => {
 			let val = '/test/foo';
 			let file = new File() as TestFile;
 			file.base = val;
@@ -976,7 +976,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('normalizes and removes trailing separator on set', function(done) {
+		it('normalizes and removes trailing separator on set', done => {
 			let val = '/test/foo/../foo/';
 			let expected = path.normalize(val.slice(0, -1));
 			let file = new File();
@@ -1020,8 +1020,8 @@ describe('File', function() {
 		// });
 	});
 
-	describe('relative get/set', function() {
-		it('throws on set', function(done) {
+	describe('relative get/set', () => {
+		it('throws on set', done => {
 			let file = new File();
 
 			function invalid() {
@@ -1032,7 +1032,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('throws on get with no path', function(done) {
+		it('throws on get with no path', done => {
 			let file = new File();
 
 			function invalid() {
@@ -1043,7 +1043,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('returns a relative path from base', function(done) {
+		it('returns a relative path from base', done => {
 			let file = new File({
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1053,7 +1053,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('returns a relative path from cwd', function(done) {
+		it('returns a relative path from cwd', done => {
 			let file = new File({
 				cwd: '/',
 				path: '/test/test.coffee',
@@ -1063,7 +1063,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('does not append separator when directory', function(done) {
+		it('does not append separator when directory', done => {
 			let file = new File({
 				base: '/test',
 				path: '/test/foo/bar',
@@ -1078,7 +1078,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('does not append separator when symlink', function(done) {
+		it('does not append separator when symlink', done => {
 			let file = new File({
 				base: '/test',
 				path: '/test/foo/bar',
@@ -1093,7 +1093,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('does not append separator when directory & symlink', function(done) {
+		it('does not append separator when directory & symlink', done => {
 			let file = new File({
 				base: '/test',
 				path: '/test/foo/bar',
@@ -1112,8 +1112,8 @@ describe('File', function() {
 		});
 	});
 
-	describe('dirname get/set', function() {
-		it('throws on get with no path', function(done) {
+	describe('dirname get/set', () => {
+		it('throws on get with no path', done => {
 			let file = new File();
 
 			function invalid() {
@@ -1124,7 +1124,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('returns the dirname without trailing separator', function(done) {
+		it('returns the dirname without trailing separator', done => {
 			let file = new File({
 				cwd: '/',
 				base: '/test',
@@ -1135,7 +1135,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('throws on set with no path', function(done) {
+		it('throws on set with no path', done => {
 			let file = new File();
 
 			function invalid() {
@@ -1146,7 +1146,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('replaces the dirname of the path', function(done) {
+		it('replaces the dirname of the path', done => {
 			let file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -1159,8 +1159,8 @@ describe('File', function() {
 		});
 	});
 
-	describe('basename get/set', function() {
-		it('throws on get with no path', function(done) {
+	describe('basename get/set', () => {
+		it('throws on get with no path', done => {
 			let file = new File();
 
 			function invalid() {
@@ -1171,7 +1171,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('returns the basename of the path', function(done) {
+		it('returns the basename of the path', done => {
 			let file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -1182,7 +1182,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('does not append trailing separator when directory', function(done) {
+		it('does not append trailing separator when directory', done => {
 			let file = new File({
 				path: '/test/foo',
 				stat: {
@@ -1196,7 +1196,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('does not append trailing separator when symlink', function(done) {
+		it('does not append trailing separator when symlink', done => {
 			let file = new File({
 				path: '/test/foo',
 				stat: {
@@ -1210,7 +1210,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('does not append trailing separator when directory & symlink', function(done) {
+		it('does not append trailing separator when directory & symlink', done => {
 			let file = new File({
 				path: '/test/foo',
 				stat: {
@@ -1227,7 +1227,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('removes trailing separator', function(done) {
+		it('removes trailing separator', done => {
 			let file = new File({
 				path: '/test/foo/',
 			});
@@ -1236,7 +1236,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('removes trailing separator when directory', function(done) {
+		it('removes trailing separator when directory', done => {
 			let file = new File({
 				path: '/test/foo/',
 				stat: {
@@ -1250,7 +1250,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('removes trailing separator when symlink', function(done) {
+		it('removes trailing separator when symlink', done => {
 			let file = new File({
 				path: '/test/foo/',
 				stat: {
@@ -1264,7 +1264,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('removes trailing separator when directory & symlink', function(done) {
+		it('removes trailing separator when directory & symlink', done => {
 			let file = new File({
 				path: '/test/foo/',
 				stat: {
@@ -1281,7 +1281,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('throws on set with no path', function(done) {
+		it('throws on set with no path', done => {
 			let file = new File();
 
 			function invalid() {
@@ -1292,7 +1292,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('replaces the basename of the path', function(done) {
+		it('replaces the basename of the path', done => {
 			let file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -1305,8 +1305,8 @@ describe('File', function() {
 		});
 	});
 
-	describe('stem get/set', function() {
-		it('throws on get with no path', function(done) {
+	describe('stem get/set', () => {
+		it('throws on get with no path', done => {
 			let file = new File();
 
 			function invalid() {
@@ -1317,7 +1317,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('returns the stem of the path', function(done) {
+		it('returns the stem of the path', done => {
 			let file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -1328,7 +1328,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('throws on set with no path', function(done) {
+		it('throws on set with no path', done => {
 			let file = new File();
 
 			function invalid() {
@@ -1339,7 +1339,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('replaces the stem of the path', function(done) {
+		it('replaces the stem of the path', done => {
 			let file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -1352,8 +1352,8 @@ describe('File', function() {
 		});
 	});
 
-	describe('extname get/set', function() {
-		it('throws on get with no path', function(done) {
+	describe('extname get/set', () => {
+		it('throws on get with no path', done => {
 			let file = new File();
 
 			function invalid() {
@@ -1364,7 +1364,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('returns the extname of the path', function(done) {
+		it('returns the extname of the path', done => {
 			let file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -1375,7 +1375,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('throws on set with no path', function(done) {
+		it('throws on set with no path', done => {
 			let file = new File();
 
 			function invalid() {
@@ -1386,7 +1386,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('replaces the extname of the path', function(done) {
+		it('replaces the extname of the path', done => {
 			let file = new File({
 				cwd: '/',
 				base: '/test/',
@@ -1399,8 +1399,8 @@ describe('File', function() {
 		});
 	});
 
-	describe('path get/set', function() {
-		it('records path in history upon instantiation', function(done) {
+	describe('path get/set', () => {
+		it('records path in history upon instantiation', done => {
 			let file = new File({
 				cwd: '/',
 				path: '/test/test.coffee',
@@ -1414,7 +1414,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('records path in history when set', function(done) {
+		it('records path in history when set', done => {
 			let val = path.normalize('/test/test.js');
 			let file = new File({
 				cwd: '/',
@@ -1438,7 +1438,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('does not record path in history when set to the current path', function(done) {
+		it('does not record path in history when set to the current path', done => {
 			let val = path.normalize('/test/test.coffee');
 			let file = new File({
 				cwd: '/',
@@ -1455,7 +1455,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('does not record path in history when set to empty string', function(done) {
+		it('does not record path in history when set to empty string', done => {
 			let val = path.normalize('/test/test.coffee');
 			let file = new File({
 				cwd: '/',
@@ -1472,7 +1472,7 @@ describe('File', function() {
 		});
 
 		// TypeScript: known issue, see the comment for the `base` property.
-		// it('throws on set with null path', function(done) {
+		// it('throws on set with null path', done => {
 		//   var file = new File();
 
 		//   expect(file.path).toNotExist();
@@ -1486,7 +1486,7 @@ describe('File', function() {
 		//   done();
 		// });
 
-		it('normalizes the path upon set', function(done) {
+		it('normalizes the path upon set', done => {
 			let val = '/test/foo/../test.coffee';
 			let expected = path.normalize(val);
 			let file = new File();
@@ -1498,7 +1498,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('removes the trailing separator upon set', function(done) {
+		it('removes the trailing separator upon set', done => {
 			let file = new File();
 			file.path = '/test/';
 
@@ -1507,7 +1507,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('removes the trailing separator upon set when directory', function(done) {
+		it('removes the trailing separator upon set when directory', done => {
 			let file = new File({
 				stat: {
 					isDirectory() {
@@ -1522,7 +1522,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('removes the trailing separator upon set when symlink', function(done) {
+		it('removes the trailing separator upon set when symlink', done => {
 			let file = new File({
 				stat: {
 					isSymbolicLink() {
@@ -1537,7 +1537,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('removes the trailing separator upon set when directory & symlink', function(done) {
+		it('removes the trailing separator upon set when directory & symlink', done => {
 			let file = new File({
 				stat: {
 					isDirectory() {
@@ -1556,15 +1556,15 @@ describe('File', function() {
 		});
 	});
 
-	describe('symlink get/set', function() {
-		it('return null on get with no symlink', function(done) {
+	describe('symlink get/set', () => {
+		it('return null on get with no symlink', done => {
 			let file = new File();
 
 			expect(file.symlink).toEqual(null);
 			done();
 		});
 
-		it('returns _symlink', function(done) {
+		it('returns _symlink', done => {
 			let val = '/test/test.coffee';
 			let file = new File() as TestFile;
 			file._symlink = val;
@@ -1573,7 +1573,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('throws on set with non-string', function(done) {
+		it('throws on set with non-string', done => {
 			let file = new File();
 
 			function invalid() {
@@ -1584,7 +1584,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('sets _symlink', function(done) {
+		it('sets _symlink', done => {
 			let val = '/test/test.coffee';
 			let expected = path.normalize(val);
 			let file = new File() as TestFile;
@@ -1594,7 +1594,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('allows relative symlink', function(done) {
+		it('allows relative symlink', done => {
 			let val = 'test.coffee';
 			let file = new File();
 			file.symlink = val;
@@ -1603,7 +1603,7 @@ describe('File', function() {
 			done();
 		});
 
-		it('normalizes and removes trailing separator upon set', function(done) {
+		it('normalizes and removes trailing separator upon set', done => {
 			let val = '/test/foo/../bar/';
 			let expected = path.normalize(val.slice(0, -1));
 			let file = new File();

From fef403eff4a76ac4c49ce6bd71e666d8526194bd Mon Sep 17 00:00:00 2001
From: segayuu <segayuu@gmail.com>
Date: Fri, 15 Dec 2017 10:35:12 +0900
Subject: [PATCH 6/8] cleanup ignore lint error: prefer-const

---
 types/vinyl/tslint.json    |   3 +-
 types/vinyl/vinyl-tests.ts | 464 ++++++++++++++++++-------------------
 2 files changed, 233 insertions(+), 234 deletions(-)

diff --git a/types/vinyl/tslint.json b/types/vinyl/tslint.json
index c8b1832546..54cc466d67 100644
--- a/types/vinyl/tslint.json
+++ b/types/vinyl/tslint.json
@@ -3,7 +3,6 @@
     "rules": {
         "no-conditional-assignment": false,
         "no-construct": false,
-        "no-var-requires": false,
-        "prefer-const": false
+        "no-var-requires": false
     }
 }
diff --git a/types/vinyl/vinyl-tests.ts b/types/vinyl/vinyl-tests.ts
index b3f3be868f..31b1b68ee6 100644
--- a/types/vinyl/vinyl-tests.ts
+++ b/types/vinyl/vinyl-tests.ts
@@ -24,54 +24,54 @@ interface TestFile extends File {
 	_base?: string;
 }
 
-let pipe: (streams: [NodeJS.ReadableStream, NodeJS.WritableStream], cb: (err?: Error) => void) => void = miss.pipe;
-let from: (values: any[]) => NodeJS.ReadableStream = miss.from;
-let concat: (fn: (d: Buffer) => void) => NodeJS.WritableStream = miss.concat;
-let isCloneable: (obj: any) => boolean = cloneable.isCloneable;
+const pipe: (streams: [NodeJS.ReadableStream, NodeJS.WritableStream], cb: (err?: Error) => void) => void = miss.pipe;
+const from: (values: any[]) => NodeJS.ReadableStream = miss.from;
+const concat: (fn: (d: Buffer) => void) => NodeJS.WritableStream = miss.concat;
+const isCloneable: (obj: any) => boolean = cloneable.isCloneable;
 
-let isWin = (process.platform === 'win32');
+const isWin = (process.platform === 'win32');
 
 describe('File', () => {
 	describe('isVinyl()', () => {
 		it('returns true for a Vinyl object', done => {
-			let file = new File();
-			let result = File.isVinyl(file);
+			const file = new File();
+			const result = File.isVinyl(file);
 			expect(result).toEqual(true);
 			done();
 		});
 
 		it('returns false for a normal object', done => {
-			let result = File.isVinyl({});
+			const result = File.isVinyl({});
 			expect(result).toEqual(false);
 			done();
 		});
 
 		it('returns false for null', done => {
-			let result = File.isVinyl(null);
+			const result = File.isVinyl(null);
 			expect(result).toEqual(false);
 			done();
 		});
 
 		it('returns false for a string', done => {
-			let result = File.isVinyl('foobar');
+			const result = File.isVinyl('foobar');
 			expect(result).toEqual(false);
 			done();
 		});
 
 		it('returns false for a String object', done => {
-			let result = File.isVinyl(new String('foobar'));
+			const result = File.isVinyl(new String('foobar'));
 			expect(result).toEqual(false);
 			done();
 		});
 
 		it('returns false for a number', done => {
-			let result = File.isVinyl(1);
+			const result = File.isVinyl(1);
 			expect(result).toEqual(false);
 			done();
 		});
 
 		it('returns false for a Number object', done => {
-			let result = File.isVinyl(new Number(1));
+			const result = File.isVinyl(new Number(1));
 			expect(result).toEqual(false);
 			done();
 		});
@@ -80,7 +80,7 @@ describe('File', () => {
 		// A test was added to document and make aware during internal changes
 		// TODO: decide if this should be leak-able
 		it('returns true for a mocked object', done => {
-			let result = File.isVinyl({ _isVinyl: true });
+			const result = File.isVinyl({ _isVinyl: true });
 			expect(result).toEqual(true);
 			done();
 		});
@@ -88,46 +88,46 @@ describe('File', () => {
 
 	describe('defaults', () => {
 		it('defaults cwd to process.cwd', done => {
-			let file = new File();
+			const file = new File();
 			expect(file.cwd).toEqual(process.cwd());
 			done();
 		});
 
 		it('defaults base to process.cwd', done => {
-			let file = new File();
+			const file = new File();
 			expect(file.base).toEqual(process.cwd());
 			done();
 		});
 
 		it('defaults base to cwd property', done => {
-			let cwd = path.normalize('/');
-			let file = new File({ cwd });
+			const cwd = path.normalize('/');
+			const file = new File({ cwd });
 			expect(file.base).toEqual(cwd);
 			done();
 		});
 
 		it('defaults path to null', done => {
-			let file = new File();
+			const file = new File();
 			expect(file.path).toNotExist();
 			expect(file.path).toEqual(null);
 			done();
 		});
 
 		it('defaults history to an empty array', done => {
-			let file = new File();
+			const file = new File();
 			expect(file.history).toEqual([]);
 			done();
 		});
 
 		it('defaults stat to null', done => {
-			let file = new File();
+			const file = new File();
 			expect(file.stat).toNotExist();
 			expect(file.stat).toEqual(null);
 			done();
 		});
 
 		it('defaults contents to null', done => {
-			let file = new File();
+			const file = new File();
 			expect(file.contents).toNotExist();
 			expect(file.contents).toEqual(null);
 			done();
@@ -136,109 +136,109 @@ describe('File', () => {
 
 	describe('constructor()', () => {
 		it('sets base', done => {
-			let val = path.normalize('/');
-			let file = new File({ base: val });
+			const val = path.normalize('/');
+			const file = new File({ base: val });
 			expect(file.base).toEqual(val);
 			done();
 		});
 
 		it('sets cwd', done => {
-			let val = path.normalize('/');
-			let file = new File({ cwd: val });
+			const val = path.normalize('/');
+			const file = new File({ cwd: val });
 			expect(file.cwd).toEqual(val);
 			done();
 		});
 
 		it('sets path (and history)', done => {
-			let val = path.normalize('/test.coffee');
-			let file = new File({ path: val });
+			const val = path.normalize('/test.coffee');
+			const file = new File({ path: val });
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual([val]);
 			done();
 		});
 
 		it('sets history (and path)', done => {
-			let val = path.normalize('/test.coffee');
-			let file = new File({ history: [val] });
+			const val = path.normalize('/test.coffee');
+			const file = new File({ history: [val] });
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual([val]);
 			done();
 		});
 
 		it('sets stat', done => {
-			let val = {};
-			let file = new File({ stat: val as any as fs.Stats });
+			const val = {};
+			const file = new File({ stat: val as any as fs.Stats });
 			expect(file.stat).toEqual(val);
 			done();
 		});
 
 		it('sets contents', done => {
-			let val = new Buffer('test');
-			let file = new File({ contents: val });
+			const val = new Buffer('test');
+			const file = new File({ contents: val });
 			expect(file.contents).toEqual(val);
 			done();
 		});
 
 		it('sets custom properties', done => {
-			let sourceMap = {};
-			let file = new File({ sourceMap }) as TestFile;
+			const sourceMap = {};
+			const file = new File({ sourceMap }) as TestFile;
 			expect(file.sourceMap).toEqual(sourceMap);
 			done();
 		});
 
 		it('normalizes path', done => {
-			let val = '/test/foo/../test.coffee';
-			let expected = path.normalize(val);
-			let file = new File({ path: val });
+			const val = '/test/foo/../test.coffee';
+			const expected = path.normalize(val);
+			const file = new File({ path: val });
 			expect(file.path).toEqual(expected);
 			expect(file.history).toEqual([expected]);
 			done();
 		});
 
 		it('normalizes and removes trailing separator from path', done => {
-			let val = '/test/foo/../foo/';
-			let expected = path.normalize(val.slice(0, -1));
-			let file = new File({ path: val });
+			const val = '/test/foo/../foo/';
+			const expected = path.normalize(val.slice(0, -1));
+			const file = new File({ path: val });
 			expect(file.path).toEqual(expected);
 			done();
 		});
 
 		it('normalizes history', done => {
-			let val = [
+			const val = [
 				'/test/bar/../bar/test.coffee',
 				'/test/foo/../test.coffee',
 			];
-			let expected = val.map(p => {
+			const expected = val.map(p => {
 				return path.normalize(p);
 			});
-			let file = new File({ history: val });
+			const file = new File({ history: val });
 			expect(file.path).toEqual(expected[1]);
 			expect(file.history).toEqual(expected);
 			done();
 		});
 
 		it('normalizes and removes trailing separator from history', done => {
-			let val = [
+			const val = [
 				'/test/foo/../foo/',
 				'/test/bar/../bar/',
 			];
-			let expected = val.map(p => {
+			const expected = val.map(p => {
 				return path.normalize(p.slice(0, -1));
 			});
-			let file = new File({ history: val });
+			const file = new File({ history: val });
 			expect(file.history).toEqual(expected);
 			done();
 		});
 
 		it('appends path to history if both exist and different from last', done => {
-			let val = path.normalize('/test/baz/test.coffee');
-			let history = [
+			const val = path.normalize('/test/baz/test.coffee');
+			const history = [
 				path.normalize('/test/bar/test.coffee'),
 				path.normalize('/test/foo/test.coffee'),
 			];
-			let file = new File({ path: val, history });
+			const file = new File({ path: val, history });
 
-			let expectedHistory = history.concat(val);
+			const expectedHistory = history.concat(val);
 
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual(expectedHistory);
@@ -246,13 +246,13 @@ describe('File', () => {
 		});
 
 		it('does not append path to history if both exist and same as last', done => {
-			let val = path.normalize('/test/baz/test.coffee');
-			let history = [
+			const val = path.normalize('/test/baz/test.coffee');
+			const history = [
 				path.normalize('/test/bar/test.coffee'),
 				path.normalize('/test/foo/test.coffee'),
 				val,
 			];
-			let file = new File({ path: val, history });
+			const file = new File({ path: val, history });
 
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual(history);
@@ -260,15 +260,15 @@ describe('File', () => {
 		});
 
 		it('does not mutate history array passed in', done => {
-			let val = path.normalize('/test/baz/test.coffee');
-			let history = [
+			const val = path.normalize('/test/baz/test.coffee');
+			const history = [
 				path.normalize('/test/bar/test.coffee'),
 				path.normalize('/test/foo/test.coffee'),
 			];
-			let historyCopy = Array.prototype.slice.call(history);
-			let file = new File({ path: val, history });
+			const historyCopy = Array.prototype.slice.call(history);
+			const file = new File({ path: val, history });
 
-			let expectedHistory = history.concat(val);
+			const expectedHistory = history.concat(val);
 
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual(expectedHistory);
@@ -279,21 +279,21 @@ describe('File', () => {
 
 	describe('isBuffer()', () => {
 		it('returns true when the contents are a Buffer', done => {
-			let val = new Buffer('test');
-			let file = new File({ contents: val });
+			const val = new Buffer('test');
+			const file = new File({ contents: val });
 			expect(file.isBuffer()).toEqual(true);
 			done();
 		});
 
 		it('returns false when the contents are a Stream', done => {
-			let val = from([]);
-			let file = new File({ contents: val });
+			const val = from([]);
+			const file = new File({ contents: val });
 			expect(file.isBuffer()).toEqual(false);
 			done();
 		});
 
 		it('returns false when the contents are null', done => {
-			let file = new File({ contents: null });
+			const file = new File({ contents: null });
 			expect(file.isBuffer()).toEqual(false);
 			done();
 		});
@@ -301,21 +301,21 @@ describe('File', () => {
 
 	describe('isStream()', () => {
 		it('returns false when the contents are a Buffer', done => {
-			let val = new Buffer('test');
-			let file = new File({ contents: val });
+			const val = new Buffer('test');
+			const file = new File({ contents: val });
 			expect(file.isStream()).toEqual(false);
 			done();
 		});
 
 		it('returns true when the contents are a Stream', done => {
-			let val = from([]);
-			let file = new File({ contents: val });
+			const val = from([]);
+			const file = new File({ contents: val });
 			expect(file.isStream()).toEqual(true);
 			done();
 		});
 
 		it('returns false when the contents are null', done => {
-			let file = new File({ contents: null });
+			const file = new File({ contents: null });
 			expect(file.isStream()).toEqual(false);
 			done();
 		});
@@ -323,101 +323,101 @@ describe('File', () => {
 
 	describe('isNull()', () => {
 		it('returns false when the contents are a Buffer', done => {
-			let val = new Buffer('test');
-			let file = new File({ contents: val });
+			const val = new Buffer('test');
+			const file = new File({ contents: val });
 			expect(file.isNull()).toEqual(false);
 			done();
 		});
 
 		it('returns false when the contents are a Stream', done => {
-			let val = from([]);
-			let file = new File({ contents: val });
+			const val = from([]);
+			const file = new File({ contents: val });
 			expect(file.isNull()).toEqual(false);
 			done();
 		});
 
 		it('returns true when the contents are null', done => {
-			let file = new File({ contents: null });
+			const file = new File({ contents: null });
 			expect(file.isNull()).toEqual(true);
 			done();
 		});
 	});
 
 	describe('isDirectory()', () => {
-		let fakeStat = {
+		const fakeStat = {
 			isDirectory() {
 				return true;
 			},
 		} as any as fs.Stats;
 
 		it('returns false when the contents are a Buffer', done => {
-			let val = new Buffer('test');
-			let file = new File({ contents: val, stat: fakeStat });
+			const val = new Buffer('test');
+			const file = new File({ contents: val, stat: fakeStat });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 
 		it('returns false when the contents are a Stream', done => {
-			let val = from([]);
-			let file = new File({ contents: val, stat: fakeStat });
+			const val = from([]);
+			const file = new File({ contents: val, stat: fakeStat });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 
 		it('returns true when the contents are null & stat.isDirectory is true', done => {
-			let file = new File({ contents: null, stat: fakeStat });
+			const file = new File({ contents: null, stat: fakeStat });
 			expect(file.isDirectory()).toEqual(true);
 			done();
 		});
 
 		it('returns false when stat exists but does not contain an isDirectory method', done => {
-			let file = new File({ contents: null, stat: {} as any as fs.Stats });
+			const file = new File({ contents: null, stat: {} as any as fs.Stats });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 
 		it('returns false when stat does not exist', done => {
-			let file = new File({ contents: null });
+			const file = new File({ contents: null });
 			expect(file.isDirectory()).toEqual(false);
 			done();
 		});
 	});
 
 	describe('isSymbolic()', () => {
-		let fakeStat = {
+		const fakeStat = {
 			isSymbolicLink() {
 				return true;
 			},
 		} as any as fs.Stats;
 
 		it('returns false when the contents are a Buffer', done => {
-			let val = new Buffer('test');
-			let file = new File({ contents: val, stat: fakeStat });
+			const val = new Buffer('test');
+			const file = new File({ contents: val, stat: fakeStat });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 
 		it('returns false when the contents are a Stream', done => {
-			let val = from([]);
-			let file = new File({ contents: val, stat: fakeStat });
+			const val = from([]);
+			const file = new File({ contents: val, stat: fakeStat });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 
 		it('returns true when the contents are null & stat.isSymbolicLink is true', done => {
-			let file = new File({ contents: null, stat: fakeStat });
+			const file = new File({ contents: null, stat: fakeStat });
 			expect(file.isSymbolic()).toEqual(true);
 			done();
 		});
 
 		it('returns false when stat exists but does not contain an isSymbolicLink method', done => {
-			let file = new File({ contents: null, stat: {} as any as fs.Stats });
+			const file = new File({ contents: null, stat: {} as any as fs.Stats });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
 
 		it('returns false when stat does not exist', done => {
-			let file = new File({ contents: null });
+			const file = new File({ contents: null });
 			expect(file.isSymbolic()).toEqual(false);
 			done();
 		});
@@ -425,14 +425,14 @@ describe('File', () => {
 
 	describe('clone()', () => {
 		it('copies all attributes over with Buffer contents', done => {
-			let options = {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: new Buffer('test'),
 			};
-			let file = new File(options);
-			let file2 = file.clone();
+			const file = new File(options);
+			const file2 = file.clone();
 
 			expect(file2).toNotBe(file);
 			expect(file2.cwd).toEqual(file.cwd);
@@ -444,18 +444,18 @@ describe('File', () => {
 		});
 
 		it('assigns Buffer content reference when contents option is false', done => {
-			let options = {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.js',
 				contents: new Buffer('test'),
 			};
-			let file = new File(options);
+			const file = new File(options);
 
-			let copy1 = file.clone({ contents: false });
+			const copy1 = file.clone({ contents: false });
 			expect(copy1.contents).toBe(file.contents);
 
-			let copy2 = file.clone();
+			const copy2 = file.clone();
 			expect(copy2.contents).toNotBe(file.contents);
 
 			// TypeScript: expected compilation error
@@ -465,14 +465,14 @@ describe('File', () => {
 		});
 
 		it('copies all attributes over with Stream contents', done => {
-			let options = {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: from(['wa', 'dup']),
 			};
-			let file = new File(options);
-			let file2 = file.clone();
+			const file = new File(options);
+			const file2 = file.clone();
 
 			expect(file2).toNotBe(file);
 			expect(file2.cwd).toEqual(file.cwd);
@@ -513,14 +513,14 @@ describe('File', () => {
 		});
 
 		it('does not start flowing until all clones flows (data)', done => {
-			let options = {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: from(['wa', 'dup']),
 			};
-			let file = new File(options);
-			let file2 = file.clone();
+			const file = new File(options);
+			const file2 = file.clone();
 			let ends = 2;
 
 			let data = '';
@@ -554,14 +554,14 @@ describe('File', () => {
 		});
 
 		it('does not start flowing until all clones flows (readable)', done => {
-			let options = {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: from(['wa', 'dup']),
 			};
-			let file = new File(options);
-			let file2 = file.clone();
+			const file = new File(options);
+			const file2 = file.clone();
 
 			let data2 = '';
 
@@ -584,14 +584,14 @@ describe('File', () => {
 		});
 
 		it('copies all attributes over with null contents', done => {
-			let options = {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: null,
 			};
-			let file = new File(options);
-			let file2 = file.clone();
+			const file = new File(options);
+			const file2 = file.clone();
 
 			expect(file2).toNotBe(file);
 			expect(file2.cwd).toEqual(file.cwd);
@@ -602,7 +602,7 @@ describe('File', () => {
 		});
 
 		it('properly clones the `stat` property', done => {
-			let options = {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.js',
@@ -610,8 +610,8 @@ describe('File', () => {
 				stat: fs.statSync(__filename),
 			};
 
-			let file = new File(options);
-			let copy = file.clone();
+			const file = new File(options);
+			const copy = file.clone();
 
 			expect(copy.stat).toExist();
 			if (copy.stat != null) {
@@ -624,15 +624,15 @@ describe('File', () => {
 		});
 
 		it('properly clones the `history` property', done => {
-			let options = {
+			const options = {
 				cwd: path.normalize('/'),
 				base: path.normalize('/test/'),
 				path: path.normalize('/test/test.js'),
 				contents: new Buffer('test'),
 			};
 
-			let file = new File(options);
-			let copy = file.clone();
+			const file = new File(options);
+			const copy = file.clone();
 
 			expect(copy.history[0]).toEqual(options.path);
 			copy.path = 'lol';
@@ -641,7 +641,7 @@ describe('File', () => {
 		});
 
 		it('copies custom properties', done => {
-			let options = {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -649,8 +649,8 @@ describe('File', () => {
 				custom: { meta: {} },
 			};
 
-			let file = new File(options) as TestFile;
-			let file2 = file.clone();
+			const file = new File(options) as TestFile;
+			const file2 = file.clone();
 
 			expect(file2).toNotBe(file);
 			expect(file2.cwd).toEqual(file.cwd);
@@ -663,22 +663,22 @@ describe('File', () => {
 		});
 
 		it('copies history', done => {
-			let options = {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
 				contents: null,
 			};
-			let history = [
+			const history = [
 				path.normalize('/test/test.coffee'),
 				path.normalize('/test/test.js'),
 				path.normalize('/test/test-938di2s.js'),
 			];
 
-			let file = new File(options);
+			const file = new File(options);
 			file.path = history[1];
 			file.path = history[2];
-			let file2 = file.clone();
+			const file2 = file.clone();
 
 			expect(file2.history).toEqual(history);
 			expect(file2.history).toNotBe(file.history);
@@ -687,7 +687,7 @@ describe('File', () => {
 		});
 
 		it('supports deep & shallow copy of all attributes', done => {
-			let options = {
+			const options = {
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -695,33 +695,33 @@ describe('File', () => {
 				custom: { meta: {} },
 			};
 
-			let file = new File(options) as TestFile;
+			const file = new File(options) as TestFile;
 
-			let file2 = file.clone();
+			const file2 = file.clone();
 			expect(file2.custom).toEqual(file.custom);
 			expect(file2.custom).toNotBe(file.custom);
 			expect(file2.custom.meta).toEqual(file.custom.meta);
 			expect(file2.custom.meta).toNotBe(file.custom.meta);
 
-			let file3 = file.clone(true);
+			const file3 = file.clone(true);
 			expect(file3.custom).toEqual(file.custom);
 			expect(file3.custom).toNotBe(file.custom);
 			expect(file3.custom.meta).toEqual(file.custom.meta);
 			expect(file3.custom.meta).toNotBe(file.custom.meta);
 
-			let file4 = file.clone({ deep: true });
+			const file4 = file.clone({ deep: true });
 			expect(file4.custom).toEqual(file.custom);
 			expect(file4.custom).toNotBe(file.custom);
 			expect(file4.custom.meta).toEqual(file.custom.meta);
 			expect(file4.custom.meta).toNotBe(file.custom.meta);
 
-			let file5 = file.clone(false);
+			const file5 = file.clone(false);
 			expect(file5.custom).toEqual(file.custom);
 			expect(file5.custom).toBe(file.custom);
 			expect(file5.custom.meta).toEqual(file.custom.meta);
 			expect(file5.custom.meta).toBe(file.custom.meta);
 
-			let file6 = file.clone({ deep: false });
+			const file6 = file.clone({ deep: false });
 			expect(file6.custom).toEqual(file.custom);
 			expect(file6.custom).toBe(file.custom);
 			expect(file6.custom.meta).toEqual(file.custom.meta);
@@ -749,21 +749,21 @@ describe('File', () => {
 
 	describe('inspect()', () => {
 		it('returns correct format when no contents and no path', done => {
-			let file = new File();
+			const file = new File();
 			expect(file.inspect()).toEqual('<File >');
 			done();
 		});
 
 		it('returns correct format when Buffer contents and no path', done => {
-			let val = new Buffer('test');
-			let file = new File({ contents: val });
+			const val = new Buffer('test');
+			const file = new File({ contents: val });
 			expect(file.inspect()).toEqual('<File <Buffer 74 65 73 74>>');
 			done();
 		});
 
 		it('returns correct format when Buffer contents and relative path', done => {
-			let val = new Buffer('test');
-			let file = new File({
+			const val = new Buffer('test');
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -774,7 +774,7 @@ describe('File', () => {
 		});
 
 		it('returns correct format when Stream contents and relative path', done => {
-			let file = new File({
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -785,7 +785,7 @@ describe('File', () => {
 		});
 
 		it('returns correct format when null contents and relative path', done => {
-			let file = new File({
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -798,49 +798,49 @@ describe('File', () => {
 
 	describe('contents get/set', () => {
 		it('returns _contents', done => {
-			let val = new Buffer('test');
-			let file = new File() as TestFile;
+			const val = new Buffer('test');
+			const file = new File() as TestFile;
 			file._contents = val;
 			expect(file.contents).toEqual(val);
 			done();
 		});
 
 		it('sets _contents', done => {
-			let val = new Buffer('test');
-			let file = new File() as TestFile;
+			const val = new Buffer('test');
+			const file = new File() as TestFile;
 			file.contents = val;
 			expect(file._contents).toEqual(val);
 			done();
 		});
 
 		it('sets a Buffer', done => {
-			let val = new Buffer('test');
-			let file = new File();
+			const val = new Buffer('test');
+			const file = new File();
 			file.contents = val;
 			expect(file.contents).toEqual(val);
 			done();
 		});
 
 		it('wraps Stream in Cloneable', done => {
-			let val = from([]);
-			let file = new File();
+			const val = from([]);
+			const file = new File();
 			file.contents = val;
 			expect(isCloneable(file.contents)).toEqual(true);
 			done();
 		});
 
 		it('does not double wrap a Cloneable', done => {
-			let val = from([]);
-			let clone = cloneable(val);
-			let file = new File();
+			const val = from([]);
+			const clone = cloneable(val);
+			const file = new File();
 			file.contents = clone;
 			expect((file.contents as any)._original).toBe(val);
 			done();
 		});
 
 		it('sets null', done => {
-			let val = null;
-			let file = new File();
+			const val = null;
+			const file = new File();
 			file.contents = val;
 			expect(file.contents).toEqual(null);
 			done();
@@ -860,32 +860,32 @@ describe('File', () => {
 
 	describe('cwd get/set', () => {
 		it('returns _cwd', done => {
-			let val = '/test';
-			let file = new File() as TestFile;
+			const val = '/test';
+			const file = new File() as TestFile;
 			file._cwd = val;
 			expect(file.cwd).toEqual(val);
 			done();
 		});
 
 		it('sets _cwd', done => {
-			let val = '/test';
-			let file = new File() as TestFile;
+			const val = '/test';
+			const file = new File() as TestFile;
 			file.cwd = val;
 			expect(file._cwd).toEqual(path.normalize(val));
 			done();
 		});
 
 		it('normalizes and removes trailing separator on set', done => {
-			let val = '/test/foo/../foo/';
-			let expected = path.normalize(val.slice(0, -1));
-			let file = new File();
+			const val = '/test/foo/../foo/';
+			const expected = path.normalize(val.slice(0, -1));
+			const file = new File();
 
 			file.cwd = val;
 
 			expect(file.cwd).toEqual(expected);
 
-			let val2 = '\\test\\foo\\..\\foo\\';
-			let expected2 = path.normalize(isWin ? val2.slice(0, -1) : val2);
+			const val2 = '\\test\\foo\\..\\foo\\';
+			const expected2 = path.normalize(isWin ? val2.slice(0, -1) : val2);
 
 			file.cwd = val2;
 
@@ -922,20 +922,20 @@ describe('File', () => {
 
 	describe('base get/set', () => {
 		it('proxies cwd when omitted', done => {
-			let file = new File({ cwd: '/test' });
+			const file = new File({ cwd: '/test' });
 			expect(file.base).toEqual(file.cwd);
 			done();
 		});
 
 		it('proxies cwd when same', done => {
-			let file = new File({
+			const file = new File({
 				cwd: '/test',
 				base: '/test',
 			});
 			file.cwd = '/foo/';
 			expect(file.base).toEqual(file.cwd);
 
-			let file2 = new File({
+			const file2 = new File({
 				cwd: '/test',
 			});
 			file2.base = '/test/';
@@ -961,32 +961,32 @@ describe('File', () => {
 		// });
 
 		it('returns _base', done => {
-			let val = '/test/';
-			let file = new File() as TestFile;
+			const val = '/test/';
+			const file = new File() as TestFile;
 			file._base = val;
 			expect(file.base).toEqual(val);
 			done();
 		});
 
 		it('sets _base', done => {
-			let val = '/test/foo';
-			let file = new File() as TestFile;
+			const val = '/test/foo';
+			const file = new File() as TestFile;
 			file.base = val;
 			expect(file._base).toEqual(path.normalize(val));
 			done();
 		});
 
 		it('normalizes and removes trailing separator on set', done => {
-			let val = '/test/foo/../foo/';
-			let expected = path.normalize(val.slice(0, -1));
-			let file = new File();
+			const val = '/test/foo/../foo/';
+			const expected = path.normalize(val.slice(0, -1));
+			const file = new File();
 
 			file.base = val;
 
 			expect(file.base).toEqual(expected);
 
-			let val2 = '\\test\\foo\\..\\foo\\';
-			let expected2 = path.normalize(isWin ? val2.slice(0, -1) : val2);
+			const val2 = '\\test\\foo\\..\\foo\\';
+			const expected2 = path.normalize(isWin ? val2.slice(0, -1) : val2);
 
 			file.base = val2;
 
@@ -1022,7 +1022,7 @@ describe('File', () => {
 
 	describe('relative get/set', () => {
 		it('throws on set', done => {
-			let file = new File();
+			const file = new File();
 
 			function invalid() {
 				file.relative = 'test';
@@ -1033,7 +1033,7 @@ describe('File', () => {
 		});
 
 		it('throws on get with no path', done => {
-			let file = new File();
+			const file = new File();
 
 			function invalid() {
 				file.relative;
@@ -1044,7 +1044,7 @@ describe('File', () => {
 		});
 
 		it('returns a relative path from base', done => {
-			let file = new File({
+			const file = new File({
 				base: '/test/',
 				path: '/test/test.coffee',
 			});
@@ -1054,7 +1054,7 @@ describe('File', () => {
 		});
 
 		it('returns a relative path from cwd', done => {
-			let file = new File({
+			const file = new File({
 				cwd: '/',
 				path: '/test/test.coffee',
 			});
@@ -1064,7 +1064,7 @@ describe('File', () => {
 		});
 
 		it('does not append separator when directory', done => {
-			let file = new File({
+			const file = new File({
 				base: '/test',
 				path: '/test/foo/bar',
 				stat: {
@@ -1079,7 +1079,7 @@ describe('File', () => {
 		});
 
 		it('does not append separator when symlink', done => {
-			let file = new File({
+			const file = new File({
 				base: '/test',
 				path: '/test/foo/bar',
 				stat: {
@@ -1094,7 +1094,7 @@ describe('File', () => {
 		});
 
 		it('does not append separator when directory & symlink', done => {
-			let file = new File({
+			const file = new File({
 				base: '/test',
 				path: '/test/foo/bar',
 				stat: {
@@ -1114,7 +1114,7 @@ describe('File', () => {
 
 	describe('dirname get/set', () => {
 		it('throws on get with no path', done => {
-			let file = new File();
+			const file = new File();
 
 			function invalid() {
 				file.dirname;
@@ -1125,7 +1125,7 @@ describe('File', () => {
 		});
 
 		it('returns the dirname without trailing separator', done => {
-			let file = new File({
+			const file = new File({
 				cwd: '/',
 				base: '/test',
 				path: '/test/test.coffee',
@@ -1136,7 +1136,7 @@ describe('File', () => {
 		});
 
 		it('throws on set with no path', done => {
-			let file = new File();
+			const file = new File();
 
 			function invalid() {
 				file.dirname = '/test';
@@ -1147,7 +1147,7 @@ describe('File', () => {
 		});
 
 		it('replaces the dirname of the path', done => {
-			let file = new File({
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1161,7 +1161,7 @@ describe('File', () => {
 
 	describe('basename get/set', () => {
 		it('throws on get with no path', done => {
-			let file = new File();
+			const file = new File();
 
 			function invalid() {
 				return file.basename;
@@ -1172,7 +1172,7 @@ describe('File', () => {
 		});
 
 		it('returns the basename of the path', done => {
-			let file = new File({
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1183,7 +1183,7 @@ describe('File', () => {
 		});
 
 		it('does not append trailing separator when directory', done => {
-			let file = new File({
+			const file = new File({
 				path: '/test/foo',
 				stat: {
 					isDirectory() {
@@ -1197,7 +1197,7 @@ describe('File', () => {
 		});
 
 		it('does not append trailing separator when symlink', done => {
-			let file = new File({
+			const file = new File({
 				path: '/test/foo',
 				stat: {
 					isSymbolicLink() {
@@ -1211,7 +1211,7 @@ describe('File', () => {
 		});
 
 		it('does not append trailing separator when directory & symlink', done => {
-			let file = new File({
+			const file = new File({
 				path: '/test/foo',
 				stat: {
 					isDirectory() {
@@ -1228,7 +1228,7 @@ describe('File', () => {
 		});
 
 		it('removes trailing separator', done => {
-			let file = new File({
+			const file = new File({
 				path: '/test/foo/',
 			});
 
@@ -1237,7 +1237,7 @@ describe('File', () => {
 		});
 
 		it('removes trailing separator when directory', done => {
-			let file = new File({
+			const file = new File({
 				path: '/test/foo/',
 				stat: {
 					isDirectory() {
@@ -1251,7 +1251,7 @@ describe('File', () => {
 		});
 
 		it('removes trailing separator when symlink', done => {
-			let file = new File({
+			const file = new File({
 				path: '/test/foo/',
 				stat: {
 					isSymbolicLink() {
@@ -1265,7 +1265,7 @@ describe('File', () => {
 		});
 
 		it('removes trailing separator when directory & symlink', done => {
-			let file = new File({
+			const file = new File({
 				path: '/test/foo/',
 				stat: {
 					isDirectory() {
@@ -1282,7 +1282,7 @@ describe('File', () => {
 		});
 
 		it('throws on set with no path', done => {
-			let file = new File();
+			const file = new File();
 
 			function invalid() {
 				file.basename = 'test.coffee';
@@ -1293,7 +1293,7 @@ describe('File', () => {
 		});
 
 		it('replaces the basename of the path', done => {
-			let file = new File({
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1307,7 +1307,7 @@ describe('File', () => {
 
 	describe('stem get/set', () => {
 		it('throws on get with no path', done => {
-			let file = new File();
+			const file = new File();
 
 			function invalid() {
 				file.stem;
@@ -1318,7 +1318,7 @@ describe('File', () => {
 		});
 
 		it('returns the stem of the path', done => {
-			let file = new File({
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1329,7 +1329,7 @@ describe('File', () => {
 		});
 
 		it('throws on set with no path', done => {
-			let file = new File();
+			const file = new File();
 
 			function invalid() {
 				file.stem = 'test.coffee';
@@ -1340,7 +1340,7 @@ describe('File', () => {
 		});
 
 		it('replaces the stem of the path', done => {
-			let file = new File({
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1354,7 +1354,7 @@ describe('File', () => {
 
 	describe('extname get/set', () => {
 		it('throws on get with no path', done => {
-			let file = new File();
+			const file = new File();
 
 			function invalid() {
 				file.extname;
@@ -1365,7 +1365,7 @@ describe('File', () => {
 		});
 
 		it('returns the extname of the path', done => {
-			let file = new File({
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1376,7 +1376,7 @@ describe('File', () => {
 		});
 
 		it('throws on set with no path', done => {
-			let file = new File();
+			const file = new File();
 
 			function invalid() {
 				file.extname = '.coffee';
@@ -1387,7 +1387,7 @@ describe('File', () => {
 		});
 
 		it('replaces the extname of the path', done => {
-			let file = new File({
+			const file = new File({
 				cwd: '/',
 				base: '/test/',
 				path: '/test/test.coffee',
@@ -1401,11 +1401,11 @@ describe('File', () => {
 
 	describe('path get/set', () => {
 		it('records path in history upon instantiation', done => {
-			let file = new File({
+			const file = new File({
 				cwd: '/',
 				path: '/test/test.coffee',
 			});
-			let history = [
+			const history = [
 				path.normalize('/test/test.coffee'),
 			];
 
@@ -1415,12 +1415,12 @@ describe('File', () => {
 		});
 
 		it('records path in history when set', done => {
-			let val = path.normalize('/test/test.js');
-			let file = new File({
+			const val = path.normalize('/test/test.js');
+			const file = new File({
 				cwd: '/',
 				path: '/test/test.coffee',
 			});
-			let history = [
+			const history = [
 				path.normalize('/test/test.coffee'),
 				val,
 			];
@@ -1429,7 +1429,7 @@ describe('File', () => {
 			expect(file.path).toEqual(val);
 			expect(file.history).toEqual(history);
 
-			let val2 = path.normalize('/test/test.es6');
+			const val2 = path.normalize('/test/test.es6');
 			history.push(val2);
 
 			file.path = val2;
@@ -1439,12 +1439,12 @@ describe('File', () => {
 		});
 
 		it('does not record path in history when set to the current path', done => {
-			let val = path.normalize('/test/test.coffee');
-			let file = new File({
+			const val = path.normalize('/test/test.coffee');
+			const file = new File({
 				cwd: '/',
 				path: val,
 			});
-			let history = [
+			const history = [
 				val,
 			];
 
@@ -1456,12 +1456,12 @@ describe('File', () => {
 		});
 
 		it('does not record path in history when set to empty string', done => {
-			let val = path.normalize('/test/test.coffee');
-			let file = new File({
+			const val = path.normalize('/test/test.coffee');
+			const file = new File({
 				cwd: '/',
 				path: val,
 			});
-			let history = [
+			const history = [
 				val,
 			];
 
@@ -1487,9 +1487,9 @@ describe('File', () => {
 		// });
 
 		it('normalizes the path upon set', done => {
-			let val = '/test/foo/../test.coffee';
-			let expected = path.normalize(val);
-			let file = new File();
+			const val = '/test/foo/../test.coffee';
+			const expected = path.normalize(val);
+			const file = new File();
 
 			file.path = val;
 
@@ -1499,7 +1499,7 @@ describe('File', () => {
 		});
 
 		it('removes the trailing separator upon set', done => {
-			let file = new File();
+			const file = new File();
 			file.path = '/test/';
 
 			expect(file.path).toEqual(path.normalize('/test'));
@@ -1508,7 +1508,7 @@ describe('File', () => {
 		});
 
 		it('removes the trailing separator upon set when directory', done => {
-			let file = new File({
+			const file = new File({
 				stat: {
 					isDirectory() {
 						return true;
@@ -1523,7 +1523,7 @@ describe('File', () => {
 		});
 
 		it('removes the trailing separator upon set when symlink', done => {
-			let file = new File({
+			const file = new File({
 				stat: {
 					isSymbolicLink() {
 						return true;
@@ -1538,7 +1538,7 @@ describe('File', () => {
 		});
 
 		it('removes the trailing separator upon set when directory & symlink', done => {
-			let file = new File({
+			const file = new File({
 				stat: {
 					isDirectory() {
 						return true;
@@ -1558,15 +1558,15 @@ describe('File', () => {
 
 	describe('symlink get/set', () => {
 		it('return null on get with no symlink', done => {
-			let file = new File();
+			const file = new File();
 
 			expect(file.symlink).toEqual(null);
 			done();
 		});
 
 		it('returns _symlink', done => {
-			let val = '/test/test.coffee';
-			let file = new File() as TestFile;
+			const val = '/test/test.coffee';
+			const file = new File() as TestFile;
 			file._symlink = val;
 
 			expect(file.symlink).toEqual(val);
@@ -1574,7 +1574,7 @@ describe('File', () => {
 		});
 
 		it('throws on set with non-string', done => {
-			let file = new File();
+			const file = new File();
 
 			function invalid() {
 				file.symlink = null;
@@ -1585,9 +1585,9 @@ describe('File', () => {
 		});
 
 		it('sets _symlink', done => {
-			let val = '/test/test.coffee';
-			let expected = path.normalize(val);
-			let file = new File() as TestFile;
+			const val = '/test/test.coffee';
+			const expected = path.normalize(val);
+			const file = new File() as TestFile;
 			file.symlink = val;
 
 			expect(file._symlink).toEqual(expected);
@@ -1595,8 +1595,8 @@ describe('File', () => {
 		});
 
 		it('allows relative symlink', done => {
-			let val = 'test.coffee';
-			let file = new File();
+			const val = 'test.coffee';
+			const file = new File();
 			file.symlink = val;
 
 			expect(file.symlink).toEqual(val);
@@ -1604,9 +1604,9 @@ describe('File', () => {
 		});
 
 		it('normalizes and removes trailing separator upon set', done => {
-			let val = '/test/foo/../bar/';
-			let expected = path.normalize(val.slice(0, -1));
-			let file = new File();
+			const val = '/test/foo/../bar/';
+			const expected = path.normalize(val.slice(0, -1));
+			const file = new File();
 			file.symlink = val;
 
 			expect(file.symlink).toEqual(expected);

From 37c948fdc189cf42a755cfecacdaa17f6d60519c Mon Sep 17 00:00:00 2001
From: segayuu <segayuu@gmail.com>
Date: Fri, 15 Dec 2017 10:38:06 +0900
Subject: [PATCH 7/8] cleanup ignore lint error: no-conditional-assignment

---
 types/vinyl/tslint.json    | 1 -
 types/vinyl/vinyl-tests.ts | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/types/vinyl/tslint.json b/types/vinyl/tslint.json
index 54cc466d67..5eea98e41f 100644
--- a/types/vinyl/tslint.json
+++ b/types/vinyl/tslint.json
@@ -1,7 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-conditional-assignment": false,
         "no-construct": false,
         "no-var-requires": false
     }
diff --git a/types/vinyl/vinyl-tests.ts b/types/vinyl/vinyl-tests.ts
index 31b1b68ee6..777ed6fcce 100644
--- a/types/vinyl/vinyl-tests.ts
+++ b/types/vinyl/vinyl-tests.ts
@@ -571,8 +571,7 @@ describe('File', () => {
 
 			// Start flowing file2
 			file2.contents.on('readable', function(this: NodeJS.ReadableStream) {
-				let chunk: string | Buffer;
-				while ((chunk = this.read()) !== null) {
+				for (let chunk: string | Buffer = this.read(); chunk !== null; chunk = this.read()) {
 					data2 += chunk.toString();
 				}
 			});

From 349c8bb54469b8e78da9a2aa663db2d32aa77aa5 Mon Sep 17 00:00:00 2001
From: segayuu <segayuu@gmail.com>
Date: Fri, 15 Dec 2017 10:41:26 +0900
Subject: [PATCH 8/8] cleanup ignore lint error: no-construct All lines whose
 rules are ignored are all clearly intentioned codes.

---
 types/vinyl/tslint.json    | 1 -
 types/vinyl/vinyl-tests.ts | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/vinyl/tslint.json b/types/vinyl/tslint.json
index 5eea98e41f..1e30988418 100644
--- a/types/vinyl/tslint.json
+++ b/types/vinyl/tslint.json
@@ -1,7 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-construct": false,
         "no-var-requires": false
     }
 }
diff --git a/types/vinyl/vinyl-tests.ts b/types/vinyl/vinyl-tests.ts
index 777ed6fcce..3a73249b60 100644
--- a/types/vinyl/vinyl-tests.ts
+++ b/types/vinyl/vinyl-tests.ts
@@ -59,6 +59,7 @@ describe('File', () => {
 		});
 
 		it('returns false for a String object', done => {
+			// tslint:disable-next-line:no-construct
 			const result = File.isVinyl(new String('foobar'));
 			expect(result).toEqual(false);
 			done();
@@ -71,6 +72,7 @@ describe('File', () => {
 		});
 
 		it('returns false for a Number object', done => {
+			// tslint:disable-next-line:no-construct
 			const result = File.isVinyl(new Number(1));
 			expect(result).toEqual(false);
 			done();