diff --git a/gulp-changed/gulp-changed.d.ts b/gulp-changed/gulp-changed.d.ts index b1295faf92..93cebfcb8b 100644 --- a/gulp-changed/gulp-changed.d.ts +++ b/gulp-changed/gulp-changed.d.ts @@ -4,11 +4,9 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped /// -/// - import { Transform } from "stream"; -import File = require("vinyl"); +import File = require("../vinyl"); interface IComparator { /** diff --git a/gulp-cheerio/gulp-cheerio-tests.ts b/gulp-cheerio/gulp-cheerio-tests.ts index 8a32c57d21..954dcdf22e 100644 --- a/gulp-cheerio/gulp-cheerio-tests.ts +++ b/gulp-cheerio/gulp-cheerio-tests.ts @@ -1,11 +1,10 @@ /// -/// /// /// import cheerio = require('gulp-cheerio'); import gulp = require('gulp'); -import Vinyl = require('vinyl'); +import Vinyl = require('../vinyl'); // // There are two ways to use gulp-cheerio: synchronous and asynchronous. See the following usage examples: diff --git a/gulp-cheerio/gulp-cheerio.d.ts b/gulp-cheerio/gulp-cheerio.d.ts index 3871ef12de..2444e6a974 100644 --- a/gulp-cheerio/gulp-cheerio.d.ts +++ b/gulp-cheerio/gulp-cheerio.d.ts @@ -5,10 +5,8 @@ /// /// -/// - -import Vinyl = require('vinyl'); +import Vinyl = require('../vinyl'); declare namespace cheerio { interface Cheerio { diff --git a/gulp-filter/gulp-filter.d.ts b/gulp-filter/gulp-filter.d.ts index 542cf737b5..c6a2222025 100644 --- a/gulp-filter/gulp-filter.d.ts +++ b/gulp-filter/gulp-filter.d.ts @@ -4,9 +4,6 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped /// -/// -/// - import File = require('vinyl'); import * as Minimatch from 'minimatch'; diff --git a/gulp-if/gulp-if.d.ts b/gulp-if/gulp-if.d.ts index 50c71803ef..6902205de2 100644 --- a/gulp-if/gulp-if.d.ts +++ b/gulp-if/gulp-if.d.ts @@ -4,11 +4,9 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped /// -/// - import fs = require('fs'); -import vinyl = require('vinyl'); +import vinyl = require('../vinyl'); interface GulpIf { /** diff --git a/gulp-inject/gulp-inject.d.ts b/gulp-inject/gulp-inject.d.ts index 8794caf123..6ad1c56590 100644 --- a/gulp-inject/gulp-inject.d.ts +++ b/gulp-inject/gulp-inject.d.ts @@ -4,11 +4,8 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped /// -/// - - -import File = require("vinyl"); +import File = require("../vinyl"); interface ITagFunction { (targetExt: string, sourceExt: string): string; diff --git a/gulp-tslint/gulp-tslint-tests.ts b/gulp-tslint/gulp-tslint-tests.ts index 8658f103f0..4770b1b723 100644 --- a/gulp-tslint/gulp-tslint-tests.ts +++ b/gulp-tslint/gulp-tslint-tests.ts @@ -1,10 +1,9 @@ /// /// -/// import * as gulp from 'gulp'; import * as tslint from 'gulp-tslint'; -import vinyl = require('vinyl'); +import vinyl = require('../vinyl'); // Taken from gulp-tslint README https://github.com/panuhorsmalahti/gulp-tslint/blob/master/README.md diff --git a/gulp-tslint/gulp-tslint.d.ts b/gulp-tslint/gulp-tslint.d.ts index 34420daa7b..203de3dae7 100644 --- a/gulp-tslint/gulp-tslint.d.ts +++ b/gulp-tslint/gulp-tslint.d.ts @@ -4,10 +4,8 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped /// -/// - -import vinyl = require("vinyl"); +import vinyl = require("../vinyl"); declare namespace gulpTsLint { interface GulpTsLint { diff --git a/gulp-uglify/gulp-uglify.d.ts b/gulp-uglify/gulp-uglify.d.ts index fb7b04db9c..875f79f455 100644 --- a/gulp-uglify/gulp-uglify.d.ts +++ b/gulp-uglify/gulp-uglify.d.ts @@ -4,8 +4,6 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped /// -/// - import * as UglifyJS from 'uglify-js'; diff --git a/gulp-util/gulp-util.d.ts b/gulp-util/gulp-util.d.ts index 9982835cf9..f1cf74cc66 100644 --- a/gulp-util/gulp-util.d.ts +++ b/gulp-util/gulp-util.d.ts @@ -4,109 +4,104 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped /// -/// /// /// -declare module 'gulp-util' { +import vinyl = require('../vinyl'); +import chalk = require('chalk'); +import through2 = require('through2'); - import vinyl = require('vinyl'); - import chalk = require('chalk'); - import through2 = require('through2'); +export class File extends vinyl { } - export class File extends vinyl { } +/** +* Replaces a file extension in a path. Returns the new path. +*/ +export function replaceExtension(npath: string, ext: string): string; +export var colors: typeof chalk; + +export var date: { + (now?: Date, mask?: string, convertLocalTimeToUTC?: boolean): any; + (date?: string, mask?: string, convertLocalTimeToUTC?: boolean): any; + masks: any; +}; + +/** +* Logs stuff. Already prefixed with [gulp] and all that. Use the right colors +* for values. If you pass in multiple arguments it will join them by a space. +*/ +export function log(message?: any, ...optionalParams: any[]): void; + +/** +* This is a lodash.template function wrapper. You must pass in a valid gulp +* file object so it is available to the user or it will error. You can not +* configure any of the delimiters. Look at the lodash docs for more info. +*/ +export function template(tmpl: string): (opt: { file: { path: string } }) => string; +export function template(tmpl: string, opt: { file: { path: string } }): string; + +export var env: any; + +export function beep(): void; + +/** +* Returns a stream that does nothing but pass data straight through. +*/ +export var noop: typeof through2; + +export function isStream(obj: any): boolean; + +export function isBuffer(obj: any): boolean; + +export function isNull(obj: any): boolean; + +export var linefeed: string; + +export function combine(streams: NodeJS.ReadWriteStream[]): () => NodeJS.ReadWriteStream; +export function combine(...streams: NodeJS.ReadWriteStream[]): () => NodeJS.ReadWriteStream; + +/** +* This is similar to es.wait but instead of buffering text into one string +* it buffers anything into an array (so very useful for file objects). +*/ +export function buffer(cb?: (err: Error, data: any[]) => void): NodeJS.ReadWriteStream; + +export class PluginError implements Error, PluginErrorOptions { + constructor(options?: PluginErrorOptions); + constructor(pluginName: string, options?: PluginErrorOptions); + constructor(pluginName: string, message: string, options?: PluginErrorOptions); + constructor(pluginName: string, message: Error, options?: PluginErrorOptions); /** - * Replaces a file extension in a path. Returns the new path. + * The module name of your plugin. */ - export function replaceExtension(npath: string, ext: string): string; - - export var colors: typeof chalk; - - export var date: { - (now?: Date, mask?: string, convertLocalTimeToUTC?: boolean): any; - (date?: string, mask?: string, convertLocalTimeToUTC?: boolean): any; - masks: any; - }; - + name: string; /** - * Logs stuff. Already prefixed with [gulp] and all that. Use the right colors - * for values. If you pass in multiple arguments it will join them by a space. + * Can be a string or an existing error. */ - export function log(message?: any, ...optionalParams: any[]): void; - + message: any; + fileName: string; + lineNumber: number; /** - * This is a lodash.template function wrapper. You must pass in a valid gulp - * file object so it is available to the user or it will error. You can not - * configure any of the delimiters. Look at the lodash docs for more info. + * You need to include the message along with this stack. If you pass an + * error in as the message the stack will be pulled from that, otherwise one + * will be created. */ - export function template(tmpl: string): (opt: { file: { path: string } }) => string; - export function template(tmpl: string, opt: { file: { path: string } }): string; - - export var env: any; - - export function beep(): void; - + stack: string; /** - * Returns a stream that does nothing but pass data straight through. + * By default the stack will not be shown. Set this to true if you think the + * stack is important for your error. */ - export var noop: typeof through2; - - export function isStream(obj: any): boolean; - - export function isBuffer(obj: any): boolean; - - export function isNull(obj: any): boolean; - - export var linefeed: string; - - export function combine(streams: NodeJS.ReadWriteStream[]): () => NodeJS.ReadWriteStream; - export function combine(...streams: NodeJS.ReadWriteStream[]): () => NodeJS.ReadWriteStream; - + showStack: boolean; /** - * This is similar to es.wait but instead of buffering text into one string - * it buffers anything into an array (so very useful for file objects). + * Error properties will be included in err.toString(). Can be omitted by + * setting this to false. */ - export function buffer(cb?: (err: Error, data: any[]) => void): NodeJS.ReadWriteStream; - - export class PluginError implements Error, PluginErrorOptions { - constructor(options?: PluginErrorOptions); - constructor(pluginName: string, options?: PluginErrorOptions); - constructor(pluginName: string, message: string, options?: PluginErrorOptions); - constructor(pluginName: string, message: Error, options?: PluginErrorOptions); - /** - * The module name of your plugin. - */ - name: string; - /** - * Can be a string or an existing error. - */ - message: any; - fileName: string; - lineNumber: number; - /** - * You need to include the message along with this stack. If you pass an - * error in as the message the stack will be pulled from that, otherwise one - * will be created. - */ - stack: string; - /** - * By default the stack will not be shown. Set this to true if you think the - * stack is important for your error. - */ - showStack: boolean; - /** - * Error properties will be included in err.toString(). Can be omitted by - * setting this to false. - */ - showProperties: boolean; - plugin: string; - error: Error; - } - + showProperties: boolean; + plugin: string; + error: Error; } -interface PluginErrorOptions { +export interface PluginErrorOptions { /** * The module name of your plugin. */