Merge pull request #410 from johnnyreilly/master

remove arrify dependency

package.json

@@ -28,7 +28,6 @@
   },
   "homepage": "https://github.com/TypeStrong/ts-loader",
   "dependencies": {
-    "arrify": "^1.0.0",
     "colors": "^1.0.3",
     "enhanced-resolve": "^0.9.0",
     "loader-utils": "^0.2.6",

src/index.ts

@@ -1,7 +1,6 @@
 import path = require('path');
 import loaderUtils = require('loader-utils');
 import objectAssign = require('object-assign');
-import arrify = require('arrify');
 require('colors');
 
 import instances = require('./instances');
@@ -65,7 +64,7 @@ function makeOptions(loader: interfaces.Webpack) {
         appendTsSuffixTo: [],
         entryFileIsJs: false,
     }, configFileOptions, queryOptions);
-    options.ignoreDiagnostics = arrify(options.ignoreDiagnostics).map(Number);
+    options.ignoreDiagnostics = utils.arrify(options.ignoreDiagnostics).map(Number);
     options.logLevel = options.logLevel.toUpperCase();
 
     // differentiate the TypeScript instance based on the webpack instance

src/utils.ts

@@ -131,3 +131,11 @@ export function collectAllDependencies(
     }
     return Object.keys(result);
 }
+
+export function arrify<T>(val: T | T[]) {
+	if (val === null || val === undefined) {
+		return [];
+	}
+
+	return Array.isArray(val) ? val : [val];
+};

test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.0/output.txt

@@ -8,5 +8,5 @@ Module build failed: Error: Typescript emitted no output for node_modules\a\inde
 You should not need to recompile .ts files in node_modules.
 Please contact the package author to advise them to use --declaration --outDir.
 More https://github.com/Microsoft/TypeScript/issues/12358
-    at Object.loader (dist\index.js:30:15)
+    at Object.loader (dist\index.js:29:15)
  @ ./.test/nodeModulesMeaningfulErrorWhenImportingTs/app.ts 2:8-20

test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.1/output.txt

@@ -8,5 +8,5 @@ Module build failed: Error: Typescript emitted no output for node_modules\a\inde
 You should not need to recompile .ts files in node_modules.
 Please contact the package author to advise them to use --declaration --outDir.
 More https://github.com/Microsoft/TypeScript/issues/12358
-    at Object.loader (dist\index.js:30:15)
+    at Object.loader (dist\index.js:29:15)
  @ ./.test/nodeModulesMeaningfulErrorWhenImportingTs/app.ts 2:8-20