wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-08-31 11:40:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5682 from stephenlautier/merge2

Browse Source 
merge2- added support for new import syntax
This commit is contained in:
Masahiro Wakame
2015-09-08 23:41:05 +09:00
parent 67d75d2531 1034cc3552
commit 16c434c397
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
merge2/merge2-tests.ts
+1 -1
View File
@@ -2,7 +2,7 @@
/// <reference path="../gulp/gulp.d.ts" />
import gulp = require('gulp');
import merge2 = require('merge2');
import * as merge2 from "merge2";
gulp.task('app-js', () =>
merge2(
merge2/merge2.d.ts
Vendored
+6 -3
View File
@@ -12,10 +12,13 @@ declare module 'merge2' {
}
interface IMerge2Stream extends NodeJS.ReadWriteStream {
add(...args: Array<NodeJS.ReadWriteStream | IMerge2Stream | Array<NodeJS.ReadWriteStream | IMerge2Stream | IOptions>>): IMerge2Stream;
add(...args: Array<NodeJS.ReadWriteStream | IMerge2Stream | Array<NodeJS.ReadWriteStream | IMerge2Stream | IOptions>>): IMerge2Stream;
}
function merge2(...args: Array<NodeJS.ReadWriteStream | IMerge2Stream | Array<NodeJS.ReadWriteStream | IMerge2Stream> | IOptions>): IMerge2Stream;
interface IMerge2 {
(...args: Array<NodeJS.ReadWriteStream | IMerge2Stream | Array<NodeJS.ReadWriteStream | IMerge2Stream> | IOptions>): IMerge2Stream;
}
export = merge2;
var _tmp: IMerge2;
export = _tmp;
}