diff --git a/gulp-protractor/gulp-protractor.d.ts b/gulp-protractor/gulp-protractor.d.ts index 4ac814780..fd98dbd43 100644 --- a/gulp-protractor/gulp-protractor.d.ts +++ b/gulp-protractor/gulp-protractor.d.ts @@ -18,8 +18,8 @@ declare module 'gulp-protractor' { interface IGulpProtractor { getProtractorDir(): string; protractor(options?: IOptions): NodeJS.ReadWriteStream; - webdriver_standalone: gulp.ITaskCallback; - webdriver_update: gulp.ITaskCallback; + webdriver_standalone: gulp.TaskCallback; + webdriver_update: gulp.TaskCallback; } var protractor: IGulpProtractor; diff --git a/gulp-tsd/gulp-tsd.d.ts b/gulp-tsd/gulp-tsd.d.ts index 20d279329..816d50d25 100644 --- a/gulp-tsd/gulp-tsd.d.ts +++ b/gulp-tsd/gulp-tsd.d.ts @@ -16,7 +16,7 @@ declare module "gulp-tsd" { opts?: Object; } - function tsd(opts?: IOptions, callback?: gulp.ITaskCallback): NodeJS.ReadWriteStream; + function tsd(opts?: IOptions, callback?: gulp.TaskCallback): NodeJS.ReadWriteStream; export = tsd; } diff --git a/gulp/gulp-tests.ts b/gulp/gulp-tests.ts index 2a69d40ca..d00690881 100644 --- a/gulp/gulp-tests.ts +++ b/gulp/gulp-tests.ts @@ -4,8 +4,8 @@ import gulp = require("gulp"); import browserSync = require("browser-sync"); -var typescript: gulp.IGulpPlugin = null; // this would be the TypeScript compiler -var jasmine: gulp.IGulpPlugin = null; // this would be the jasmine test runner +var typescript: gulp.GulpPlugin = null; // this would be the TypeScript compiler +var jasmine: gulp.GulpPlugin = null; // this would be the jasmine test runner gulp.task('compile', function() { diff --git a/gulp/gulp.d.ts b/gulp/gulp.d.ts index abb8978d1..160ee99ce 100644 --- a/gulp/gulp.d.ts +++ b/gulp/gulp.d.ts @@ -46,7 +46,7 @@ declare module "gulp" { watch: WatchMethod; } - interface IGulpPlugin { + interface GulpPlugin { (...args: any[]): NodeJS.ReadWriteStream; } @@ -57,14 +57,14 @@ declare module "gulp" { * @param glob a single glob or array of globs that indicate which files to watch for changes. * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task(). */ - (glob: string|string[], fn: (IWatchCallback|string)): NodeJS.EventEmitter; + (glob: string|string[], fn: (WatchCallback|string)): NodeJS.EventEmitter; /** * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events. * * @param glob a single glob or array of globs that indicate which files to watch for changes. * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task(). */ - (glob: string|string[], fn: (IWatchCallback|string)[]): NodeJS.EventEmitter; + (glob: string|string[], fn: (WatchCallback|string)[]): NodeJS.EventEmitter; /** * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events. * @@ -72,7 +72,7 @@ declare module "gulp" { * @param opt options, that are passed to the gaze library. * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task(). */ - (glob: string|string[], opt: IWatchOptions, fn: (IWatchCallback|string)): NodeJS.EventEmitter; + (glob: string|string[], opt: WatchOptions, fn: (WatchCallback|string)): NodeJS.EventEmitter; /** * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events. * @@ -80,7 +80,7 @@ declare module "gulp" { * @param opt options, that are passed to the gaze library. * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task(). */ - (glob: string|string[], opt: IWatchOptions, fn: (IWatchCallback|string)[]): NodeJS.EventEmitter; + (glob: string|string[], opt: WatchOptions, fn: (WatchCallback|string)[]): NodeJS.EventEmitter; } @@ -92,7 +92,7 @@ declare module "gulp" { * @param outFolder The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance. * @param opt */ - (outFolder: string|((file:string)=>string), opt?: IDestOptions): NodeJS.ReadWriteStream; + (outFolder: string|((file: string) => string), opt?: DestOptions): NodeJS.ReadWriteStream; } interface SrcMethod { @@ -101,7 +101,7 @@ declare module "gulp" { * @param glob Glob or array of globs to read. * @param opt Options to pass to node-glob through glob-stream. */ - (glob: string|string[], opt?: ISrcOptions): NodeJS.ReadWriteStream; + (glob: string|string[], opt?: SrcOptions): NodeJS.ReadWriteStream; } /** @@ -109,7 +109,7 @@ declare module "gulp" { * Specifies two options in addition to those used by node-glob: * https://github.com/isaacs/node-glob#options */ - interface ISrcOptions { + interface SrcOptions { /** * Setting this to false will return file.contents as null * and not read the file at all. @@ -231,7 +231,7 @@ declare module "gulp" { globDebug?: boolean; } - interface IDestOptions { + interface DestOptions { /** * The output folder. Only has an effect if provided output folder is relative. * Default: process.cwd() @@ -249,7 +249,7 @@ declare module "gulp" { * Options that are passed to gaze. * https://github.com/shama/gaze */ - interface IWatchOptions { + interface WatchOptions { /** Interval to pass to fs.watchFile. */ interval?: number; /** Delay for events called in succession for the same file/event. */ @@ -260,7 +260,7 @@ declare module "gulp" { cwd?: string; } - interface IWatchEvent { + interface WatchEvent { /** The type of change that occurred, either added, changed or deleted. */ type: string; /** The path to the file that triggered the event. */ @@ -270,17 +270,17 @@ declare module "gulp" { /** * Callback to be called on each watched file change. */ - interface IWatchCallback { - (event:IWatchEvent): void; + interface WatchCallback { + (event: WatchEvent): void; } - interface ITaskCallback { + interface TaskCallback { /** * Defines a task. * Tasks may be made asynchronous if they are passing a callback or return a promise or a stream. * @param cb callback used to signal asynchronous completion. Caller includes err in case of error. */ - (cb?:(err?:any)=>void): any; + (cb?: (err?: any) => void): any; } } diff --git a/run-sequence/run-sequence.d.ts b/run-sequence/run-sequence.d.ts index 221ff270e..4507e80c0 100644 --- a/run-sequence/run-sequence.d.ts +++ b/run-sequence/run-sequence.d.ts @@ -10,7 +10,7 @@ declare module "run-sequence" { import gulp = require('gulp'); interface IRunSequence { - (...streams: (string | string[] | gulp.ITaskCallback)[]): NodeJS.ReadWriteStream; + (...streams: (string | string[] | gulp.TaskCallback)[]): NodeJS.ReadWriteStream; use(gulp: gulp.Gulp): IRunSequence; }