Clean up type inclusion logic

build/lib/compilation.js

@@ -62,13 +62,17 @@ function createCompile(src, build, emitError) {
         return es.duplex(input, output);
     };
 }
-var libDtsGlob = 'node_modules/typescript/lib/*.d.ts';
-var atTypesDts = 'node_modules/@types/**/*.d.ts';
-var excludedTypesFilter = util.filter(function (data) { return !/node_modules(\/|\\)@types(\/|\\)(node|webpack|uglify-js)(\/|\\)/.test(data.path); });
+var typesDts = [
+    'node_modules/typescript/lib/*.d.ts',
+    'node_modules/@types/**/*.d.ts',
+    '!node_modules/@types/node/**/*',
+    '!node_modules/@types/webpack/**/*',
+    '!node_modules/@types/uglify-js/**/*',
+];
 function compileTask(src, out, build) {
     return function () {
         var compile = createCompile(src, build, true);
-        var srcPipe = es.merge(gulp.src(src + "/**", { base: "" + src }), gulp.src(libDtsGlob), gulp.src(atTypesDts).pipe(excludedTypesFilter));
+        var srcPipe = es.merge(gulp.src(src + "/**", { base: "" + src }), gulp.src(typesDts));
         // Do not write .d.ts files to disk, as they are not needed there.
         var dtsFilter = util.filter(function (data) { return !/\.d\.ts$/.test(data.path); });
         return srcPipe
@@ -83,7 +87,7 @@ exports.compileTask = compileTask;
 function watchTask(out, build) {
     return function () {
         var compile = createCompile('src', build);
-        var src = es.merge(gulp.src('src/**', { base: 'src' }), gulp.src(libDtsGlob), gulp.src(atTypesDts).pipe(excludedTypesFilter));
+        var src = es.merge(gulp.src('src/**', { base: 'src' }), gulp.src(typesDts));
         var watchSrc = watch('src/**', { base: 'src' });
         // Do not write .d.ts files to disk, as they are not needed there.
         var dtsFilter = util.filter(function (data) { return !/\.d\.ts$/.test(data.path); });

build/lib/compilation.ts

@@ -72,9 +72,13 @@ function createCompile(src: string, build: boolean, emitError?: boolean): (token
 	};
 }
 
-const libDtsGlob = 'node_modules/typescript/lib/*.d.ts';
-const atTypesDts = 'node_modules/@types/**/*.d.ts';
-const excludedTypesFilter = util.filter(data => !/node_modules(\/|\\)@types(\/|\\)(node|webpack|uglify-js)(\/|\\)/.test(data.path));
+const typesDts = [
+	'node_modules/typescript/lib/*.d.ts',
+	'node_modules/@types/**/*.d.ts',
+	'!node_modules/@types/node/**/*',
+	'!node_modules/@types/webpack/**/*',
+	'!node_modules/@types/uglify-js/**/*',
+];
 
 export function compileTask(src: string, out: string, build: boolean): () => NodeJS.ReadWriteStream {
 
@@ -83,8 +87,7 @@ export function compileTask(src: string, out: string, build: boolean): () => Nod
 
 		const srcPipe = es.merge(
 			gulp.src(`${src}/**`, { base: `${src}` }),
-			gulp.src(libDtsGlob),
-			gulp.src(atTypesDts).pipe(excludedTypesFilter),
+			gulp.src(typesDts),
 		);
 
 		// Do not write .d.ts files to disk, as they are not needed there.
@@ -106,8 +109,7 @@ export function watchTask(out: string, build: boolean): () => NodeJS.ReadWriteSt
 
 		const src = es.merge(
 			gulp.src('src/**', { base: 'src' }),
-			gulp.src(libDtsGlob),
-			gulp.src(atTypesDts).pipe(excludedTypesFilter),
+			gulp.src(typesDts),
 		);
 		const watchSrc = watch('src/**', { base: 'src' });