1.1.1

.gitignore

@@ -7,4 +7,8 @@ ts/*.js
 ts/*.js.map
 ts/typings/
 
-test/result/
+test/result/
+
+coverage/
+
+docs/

.npmignore

@@ -1,3 +1,4 @@
 node_modules
 test
-ts
+ts
+coverage/

.travis.yml

@@ -1,8 +1,6 @@
 language: node_js
 node_js:
-- '4.1'
+- '4.2.4'
-before_install:
-- npm install -g tsd
 deploy:
   provider: npm
   email: npm@lossless.digital

README.md

@@ -6,7 +6,7 @@ browserify and other goodies for gulp
 [![Dependency Status](https://david-dm.org/pushrocks/gulp-browser.svg)](https://david-dm.org/pushrocks/gulp-browser)
 [![bitHound Dependencies](https://www.bithound.io/github/pushrocks/gulp-browser/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/gulp-browser/master/dependencies/npm)
 [![bitHound Code](https://www.bithound.io/github/pushrocks/gulp-browser/badges/code.svg)](https://www.bithound.io/github/pushrocks/gulp-browser)
-
+[![Coverage Status](https://coveralls.io/repos/github/pushrocks/gulp-browser/badge.svg?branch=master)](https://coveralls.io/github/pushrocks/gulp-browser?branch=master)
 
 ### Usage
 gulp-browser is meant to be easy:
@@ -31,6 +31,6 @@ gulp-browser is meant to be easy:
 [![bitHound Dev Dependencies](https://www.bithound.io/github/pushrocks/gulp-browser/badges/devDependencies.svg)](https://www.bithound.io/github/pushrocks/gulp-browser/master/dependencies/npm)
 
 ### About the authors:
-[![Project Phase](https://mediaserve.lossless.digital/lossless.de/img/createdby_github.svg)](https://lossless.com/)
+[![Project Phase](https://mediaserve.lossless.digital/lossless.com/img/createdby_github.svg)](https://lossless.com/)
 
 [![Gitter](https://img.shields.io/badge/Support%20us-PayPal-blue.svg)](https://paypal.me/lossless)

dist/gulpbrowser.browserify.js

@@ -0,0 +1,20 @@
+/// <reference path="./typings/main.d.ts" />
+var plugins = require("./gulpbrowser.plugins");
+var browserify = function () {
+    return plugins.through.obj(function (file, enc, cb) {
+        var bundleCallback = function (err, bufferedContent) {
+            if (Buffer.isBuffer(bufferedContent)) {
+                file.contents = bufferedContent;
+            }
+            else {
+                plugins.beautylog.error("gulp-browser: .browserify() " + err.message);
+            }
+            cb(null, file);
+        };
+        plugins.browserify(file, { basedir: file.base })
+            .bundle(bundleCallback);
+    });
+};
+module.exports = browserify;
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImd1bHBicm93c2VyLmJyb3dzZXJpZnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsNENBQTRDO0FBQzVDLElBQU8sT0FBTyxXQUFXLHVCQUF1QixDQUFDLENBQUM7QUFDbEQsSUFBSSxVQUFVLEdBQUk7SUFDVixNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQUU7UUFDckMsSUFBSSxjQUFjLEdBQUcsVUFBUyxHQUFHLEVBQUUsZUFBZTtZQUM5QyxFQUFFLENBQUMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUEsQ0FBQztnQkFDbEMsSUFBSSxDQUFDLFFBQVEsR0FBRyxlQUFlLENBQUM7WUFDcEMsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNKLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLDhCQUE4QixHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUMxRSxDQUFDO1lBQ0QsRUFBRSxDQUFDLElBQUksRUFBQyxJQUFJLENBQUMsQ0FBQztRQUNsQixDQUFDLENBQUM7UUFDRixPQUFPLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7YUFDM0MsTUFBTSxDQUFDLGNBQWMsQ0FBQyxDQUFBO0lBQy9CLENBQUMsQ0FBQyxDQUFDO0FBQ1YsQ0FBQyxDQUFDO0FBRUgsaUJBQVMsVUFBVSxDQUFDIiwiZmlsZSI6Imd1bHBicm93c2VyLmJyb3dzZXJpZnkuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLy8gPHJlZmVyZW5jZSBwYXRoPVwiLi90eXBpbmdzL21haW4uZC50c1wiIC8+XG5pbXBvcnQgcGx1Z2lucyA9IHJlcXVpcmUoXCIuL2d1bHBicm93c2VyLnBsdWdpbnNcIik7XG5sZXQgYnJvd3NlcmlmeSA9ICBmdW5jdGlvbigpIHtcbiAgICAgICAgcmV0dXJuIHBsdWdpbnMudGhyb3VnaC5vYmooKGZpbGUsIGVuYywgY2IpID0+IHsgLy90aGlzIGlzIHRoZSB0aHJvdWdoIG9iamVjdCB0aGF0IGdldHMgcmV0dXJuZWQgYnkgZ3VscEJyb3dzZXIuYnJvd3NlcmlmeSgpO1xuICAgICAgICAgICAgdmFyIGJ1bmRsZUNhbGxiYWNrID0gZnVuY3Rpb24oZXJyLCBidWZmZXJlZENvbnRlbnQpIHtcbiAgICAgICAgICAgICAgICBpZiAoQnVmZmVyLmlzQnVmZmVyKGJ1ZmZlcmVkQ29udGVudCkpe1xuICAgICAgICAgICAgICAgICAgICBmaWxlLmNvbnRlbnRzID0gYnVmZmVyZWRDb250ZW50O1xuICAgICAgICAgICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICAgICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLmVycm9yKFwiZ3VscC1icm93c2VyOiAuYnJvd3NlcmlmeSgpIFwiICsgZXJyLm1lc3NhZ2UpO1xuICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgICAgICBjYihudWxsLGZpbGUpO1xuICAgICAgICAgICAgfTtcbiAgICAgICAgICAgIHBsdWdpbnMuYnJvd3NlcmlmeShmaWxlLCB7IGJhc2VkaXI6IGZpbGUuYmFzZSB9KVxuICAgICAgICAgICAgICAgIC5idW5kbGUoYnVuZGxlQ2FsbGJhY2spXG4gICAgICAgIH0pO1xuIH07XG5cbmV4cG9ydCA9IGJyb3dzZXJpZnk7Il0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9

dist/gulpbrowser.plugins.js

@@ -0,0 +1,11 @@
+/// <reference path="./typings/main.d.ts" />
+var plugins = {
+    beautylog: require("beautylog"),
+    through: require("through2"),
+    gutil: require("gulp-util"),
+    path: require("path"),
+    browserify: require("browserify")
+};
+module.exports = plugins;
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImd1bHBicm93c2VyLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsNENBQTRDO0FBQzVDLElBQUksT0FBTyxHQUFHO0lBQ1YsU0FBUyxFQUFFLE9BQU8sQ0FBQyxXQUFXLENBQUM7SUFDL0IsT0FBTyxFQUFFLE9BQU8sQ0FBQyxVQUFVLENBQUM7SUFDNUIsS0FBSyxFQUFFLE9BQU8sQ0FBQyxXQUFXLENBQUM7SUFDM0IsSUFBSSxFQUFFLE9BQU8sQ0FBQyxNQUFNLENBQUM7SUFDckIsVUFBVSxFQUFFLE9BQU8sQ0FBQyxZQUFZLENBQUM7Q0FDcEMsQ0FBQztBQUVGLGlCQUFTLE9BQU8sQ0FBQyIsImZpbGUiOiJndWxwYnJvd3Nlci5wbHVnaW5zLmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxudmFyIHBsdWdpbnMgPSB7XG4gICAgYmVhdXR5bG9nOiByZXF1aXJlKFwiYmVhdXR5bG9nXCIpLFxuICAgIHRocm91Z2g6IHJlcXVpcmUoXCJ0aHJvdWdoMlwiKSxcbiAgICBndXRpbDogcmVxdWlyZShcImd1bHAtdXRpbFwiKSxcbiAgICBwYXRoOiByZXF1aXJlKFwicGF0aFwiKSxcbiAgICBicm93c2VyaWZ5OiByZXF1aXJlKFwiYnJvd3NlcmlmeVwiKVxufTtcblxuZXhwb3J0ID0gcGx1Z2luczsiXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=

dist/index.js

@@ -0,0 +1,9 @@
+/// <reference path="./typings/main.d.ts" />
+var browserify = require("./gulpbrowser.browserify");
+//create the return object
+var gulpBrowser = {
+    browserify: browserify
+};
+module.exports = gulpBrowser;
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0QztBQUU1QyxJQUFPLFVBQVUsV0FBVywwQkFBMEIsQ0FBQyxDQUFDO0FBR3hELDBCQUEwQjtBQUMxQixJQUFJLFdBQVcsR0FBTztJQUNsQixVQUFVLEVBQUUsVUFBVTtDQUN6QixDQUFDO0FBR0YsaUJBQVMsV0FBVyxDQUFDIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxuXG5pbXBvcnQgYnJvd3NlcmlmeSA9IHJlcXVpcmUoXCIuL2d1bHBicm93c2VyLmJyb3dzZXJpZnlcIik7XG5cblxuLy9jcmVhdGUgdGhlIHJldHVybiBvYmplY3RcbnZhciBndWxwQnJvd3NlcjphbnkgPSB7XG4gICAgYnJvd3NlcmlmeTogYnJvd3NlcmlmeVxufTtcblxuXG5leHBvcnQgPSBndWxwQnJvd3NlcjtcbiJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ==

index.d.ts

@@ -1,12 +0,0 @@
-/// <reference path="ts/typings/main.d.ts" />
-declare module GulpBrowserBrowserify {
-    function init(): () => any;
-}
-declare var plugins: {
-    beautylog: any;
-    through: any;
-    gutil: any;
-    path: any;
-    browserify: any;
-};
-declare var gulpBrowser: any;

index.js

@@ -1,37 +0,0 @@
-#!/usr/bin/env node
-
-/// <reference path="./index.ts" />
-var GulpBrowserBrowserify;
-(function (GulpBrowserBrowserify) {
-    function init() {
-        return function () {
-            return plugins.through.obj(function (file, enc, cb) {
-                var bundleCallback = function (err, bufferedContent) {
-                    if (Buffer.isBuffer(bufferedContent)) {
-                        file.contents = bufferedContent;
-                    }
-                    else {
-                        plugins.beautylog.error("gulp-browser: .browserify() " + err.message);
-                    }
-                    cb(null, file);
-                };
-                plugins.browserify(file, { basedir: file.base })
-                    .bundle(bundleCallback);
-            });
-        };
-    }
-    GulpBrowserBrowserify.init = init;
-})(GulpBrowserBrowserify || (GulpBrowserBrowserify = {}));
-/// <reference path="./typings/main.d.ts" />
-/// <reference path="./modulebrowserify.ts" />
-var plugins = {
-    beautylog: require("beautylog"),
-    through: require("through2"),
-    gutil: require("gulp-util"),
-    path: require("path"),
-    browserify: require("browserify")
-};
-//create the return object
-var gulpBrowser = {};
-gulpBrowser.browserify = GulpBrowserBrowserify.init();
-module.exports = gulpBrowser;

npmts.json

@@ -0,0 +1,4 @@
+{
+  "mode":"default",
+  "coveralls":true
+}

package.json

@@ -1,8 +1,8 @@
 {
   "name": "gulp-browser",
-  "version": "1.0.5",
+  "version": "1.1.1",
   "description": "browserify and other goodies for gulp",
-  "main": "index.js",
+  "main": "dist/index.js",
   "scripts": {
     "test": "(npmts)",
     "reinstall": "(rm -r node_modules && npm install)",
@@ -25,14 +25,14 @@
   },
   "homepage": "https://github.com/pushrocks/gulp-browser",
   "dependencies": {
-    "beautylog": "2.0.4",
+    "beautylog": "3.1.2",
     "browserify": "13.0.0",
     "gulp-util": "3.0.7",
-    "through2": "2.0.0"
+    "through2": "2.0.1"
   },
   "devDependencies": {
-    "gulp": "3.9.0",
+    "gulp": "3.9.1",
-    "gulp-callfunction": "0.0.10",
+    "gulp-function": "1.1.1",
-    "npmts": "^2.0.2"
+    "npmts": "^3.3.2"
   }
 }

test/test.js

@@ -1,29 +1,24 @@
-/// <reference path="./typings/main.d.ts" />
+/// <reference path="../ts/typings/main.d.ts" />
 var plugins = {
     beautylog: require("beautylog"),
     gulp: require("gulp"),
-    gulpBrowser: require("../index.js"),
+    gulpBrowser: require("../dist/index.js"),
-    gulpCallFunction: require("gulp-callfunction")
+    gulpFunction: require("gulp-function")
 };
 describe("gulpBrowser", function () {
     describe(".browserify", function () {
         it("should run through smoothly", function (done) {
-            this.timeout(15000);
+            this.timeout(30000);
             plugins.gulp.task('gulpBrowserNormal', function (cb) {
                 var stream = plugins.gulp.src('./test/browserifyGulpTest.js')
                     .pipe(plugins.gulpBrowser.browserify())
                     .pipe(plugins.gulp.dest("./test/result/"))
-                    .pipe(plugins.gulpCallFunction(done));
+                    .pipe(plugins.gulpFunction(done));
                 return stream;
             });
             plugins.gulp.start.apply(plugins.gulp, ['gulpBrowserNormal']);
         });
     });
 });
-plugins.gulp.task('gulpBrowserTestError', function (cb) {
+
-    plugins.beautylog.info("Expecting an error:");
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsZ0RBQWdEO0FBQ2hELElBQUksT0FBTyxHQUFHO0lBQ1YsU0FBUyxFQUFFLE9BQU8sQ0FBQyxXQUFXLENBQUM7SUFDL0IsSUFBSSxFQUFFLE9BQU8sQ0FBQyxNQUFNLENBQUM7SUFDckIsV0FBVyxFQUFFLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQztJQUN4QyxZQUFZLEVBQUUsT0FBTyxDQUFDLGVBQWUsQ0FBQztDQUN6QyxDQUFDO0FBRUYsUUFBUSxDQUFDLGFBQWEsRUFBQztJQUNuQixRQUFRLENBQUMsYUFBYSxFQUFDO1FBQ25CLEVBQUUsQ0FBQyw2QkFBNkIsRUFBQyxVQUFTLElBQUk7WUFDMUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNwQixPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsRUFBQyxVQUFTLEVBQUU7Z0JBQzdDLElBQUksTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLDhCQUE4QixDQUFDO3FCQUN4RCxJQUFJLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsQ0FBQztxQkFDdEMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUM7cUJBQ3pDLElBQUksQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7Z0JBQ3RDLE1BQU0sQ0FBQyxNQUFNLENBQUM7WUFDbEIsQ0FBQyxDQUFDLENBQUM7WUFDSCxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDLG1CQUFtQixDQUFDLENBQUMsQ0FBQztRQUNsRSxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUMsQ0FBQyxDQUFDO0FBQ1AsQ0FBQyxDQUFDLENBQUMiLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuLi90cy90eXBpbmdzL21haW4uZC50c1wiIC8+XG52YXIgcGx1Z2lucyA9IHtcbiAgICBiZWF1dHlsb2c6IHJlcXVpcmUoXCJiZWF1dHlsb2dcIiksXG4gICAgZ3VscDogcmVxdWlyZShcImd1bHBcIiksXG4gICAgZ3VscEJyb3dzZXI6IHJlcXVpcmUoXCIuLi9kaXN0L2luZGV4LmpzXCIpLFxuICAgIGd1bHBGdW5jdGlvbjogcmVxdWlyZShcImd1bHAtZnVuY3Rpb25cIilcbn07XG5cbmRlc2NyaWJlKFwiZ3VscEJyb3dzZXJcIixmdW5jdGlvbigpe1xuICAgIGRlc2NyaWJlKFwiLmJyb3dzZXJpZnlcIixmdW5jdGlvbigpe1xuICAgICAgICBpdChcInNob3VsZCBydW4gdGhyb3VnaCBzbW9vdGhseVwiLGZ1bmN0aW9uKGRvbmUpe1xuICAgICAgICAgICAgdGhpcy50aW1lb3V0KDMwMDAwKTtcbiAgICAgICAgICAgIHBsdWdpbnMuZ3VscC50YXNrKCdndWxwQnJvd3Nlck5vcm1hbCcsZnVuY3Rpb24oY2IpIHtcbiAgICAgICAgICAgICAgICB2YXIgc3RyZWFtID0gcGx1Z2lucy5ndWxwLnNyYygnLi90ZXN0L2Jyb3dzZXJpZnlHdWxwVGVzdC5qcycpXG4gICAgICAgICAgICAgICAgICAgIC5waXBlKHBsdWdpbnMuZ3VscEJyb3dzZXIuYnJvd3NlcmlmeSgpKVxuICAgICAgICAgICAgICAgICAgICAucGlwZShwbHVnaW5zLmd1bHAuZGVzdChcIi4vdGVzdC9yZXN1bHQvXCIpKVxuICAgICAgICAgICAgICAgICAgICAucGlwZShwbHVnaW5zLmd1bHBGdW5jdGlvbihkb25lKSk7XG4gICAgICAgICAgICAgICAgcmV0dXJuIHN0cmVhbTtcbiAgICAgICAgICAgIH0pO1xuICAgICAgICAgICAgcGx1Z2lucy5ndWxwLnN0YXJ0LmFwcGx5KHBsdWdpbnMuZ3VscCwgWydndWxwQnJvd3Nlck5vcm1hbCddKTtcbiAgICAgICAgfSk7XG4gICAgfSk7XG59KTtcbiJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ==
-    var stream = plugins.gulp.src('./test/browserifyGulpTestError.js')
-        .pipe(plugins.gulpBrowser.browserify())
-        .pipe(plugins.gulp.dest("./test/result/"));
-    return stream;
-});

test/test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,IAAI,OAAO,GAAG;IACV,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC;IAC/B,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC,kBAAkB,CAAC;IACxC,YAAY,EAAE,OAAO,CAAC,eAAe,CAAC;CACzC,CAAC;AAEF,QAAQ,CAAC,aAAa,EAAC;IACnB,QAAQ,CAAC,aAAa,EAAC;QACnB,EAAE,CAAC,6BAA6B,EAAC,UAAS,IAAI;YAC1C,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAC,UAAS,EAAE;gBAC7C,IAAI,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,8BAA8B,CAAC;qBACxD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;qBACtC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;qBACzC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;gBACtC,MAAM,CAAC,MAAM,CAAC;YAClB,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

test/test.ts

@@ -1,31 +1,23 @@
-/// <reference path="./typings/main.d.ts" />
+/// <reference path="../ts/typings/main.d.ts" />
 var plugins = {
     beautylog: require("beautylog"),
     gulp: require("gulp"),
-    gulpBrowser: require("../index.js"),
+    gulpBrowser: require("../dist/index.js"),
-    gulpCallFunction: require("gulp-callfunction")
+    gulpFunction: require("gulp-function")
 };
 
 describe("gulpBrowser",function(){
     describe(".browserify",function(){
         it("should run through smoothly",function(done){
-            this.timeout(15000);
+            this.timeout(30000);
             plugins.gulp.task('gulpBrowserNormal',function(cb) {
                 var stream = plugins.gulp.src('./test/browserifyGulpTest.js')
                     .pipe(plugins.gulpBrowser.browserify())
                     .pipe(plugins.gulp.dest("./test/result/"))
-                    .pipe(plugins.gulpCallFunction(done));
+                    .pipe(plugins.gulpFunction(done));
                 return stream;
             });
             plugins.gulp.start.apply(plugins.gulp, ['gulpBrowserNormal']);
         });
     });
 });
-
-plugins.gulp.task('gulpBrowserTestError',function(cb) {
-    plugins.beautylog.info("Expecting an error:");
-    var stream = plugins.gulp.src('./test/browserifyGulpTestError.js')
-        .pipe(plugins.gulpBrowser.browserify())
-        .pipe(plugins.gulp.dest("./test/result/"))
-    return stream;
-});

ts/gulpbrowser.browserify.ts

@@ -0,0 +1,18 @@
+/// <reference path="./typings/main.d.ts" />
+import plugins = require("./gulpbrowser.plugins");
+let browserify =  function() {
+        return plugins.through.obj((file, enc, cb) => { //this is the through object that gets returned by gulpBrowser.browserify();
+            var bundleCallback = function(err, bufferedContent) {
+                if (Buffer.isBuffer(bufferedContent)){
+                    file.contents = bufferedContent;
+                } else {
+                    plugins.beautylog.error("gulp-browser: .browserify() " + err.message);
+                }
+                cb(null,file);
+            };
+            plugins.browserify(file, { basedir: file.base })
+                .bundle(bundleCallback)
+        });
+ };
+
+export = browserify;

ts/gulpbrowser.plugins.ts

@@ -0,0 +1,10 @@
+/// <reference path="./typings/main.d.ts" />
+var plugins = {
+    beautylog: require("beautylog"),
+    through: require("through2"),
+    gutil: require("gulp-util"),
+    path: require("path"),
+    browserify: require("browserify")
+};
+
+export = plugins;

ts/index.ts

@@ -1,18 +1,12 @@
 /// <reference path="./typings/main.d.ts" />
-/// <reference path="./modulebrowserify.ts" />
 
-var plugins = {
+import browserify = require("./gulpbrowser.browserify");
-    beautylog: require("beautylog"),
-    through: require("through2"),
-    gutil: require("gulp-util"),
-    path: require("path"),
-    browserify: require("browserify")
-};
 
 
 //create the return object
-var gulpBrowser:any = {};
+var gulpBrowser:any = {
+    browserify: browserify
+};
 
-gulpBrowser.browserify = GulpBrowserBrowserify.init();
 
-module.exports = gulpBrowser;
+export = gulpBrowser;

ts/modulebrowserify.ts

@@ -1,19 +0,0 @@
-/// <reference path="./index.ts" />
-module GulpBrowserBrowserify {
-    export function init() {
-        return function() {
-            return plugins.through.obj((file, enc, cb) => { //this is the through object that gets returned by gulpBrowser.browserify();
-                var bundleCallback = function(err, bufferedContent) {
-                    if (Buffer.isBuffer(bufferedContent)){
-                        file.contents = bufferedContent;
-                    } else {
-                        plugins.beautylog.error("gulp-browser: .browserify() " + err.message);
-                    }
-                    cb(null,file);
-                };
-                plugins.browserify(file, { basedir: file.base })
-                    .bundle(bundleCallback)
-            });
-        };
-    }
-}

ts/typings.json

@@ -1,7 +1,7 @@
 {
   "ambientDependencies": {
-    "browserify": "github:DefinitelyTyped/DefinitelyTyped/browserify/browserify.d.ts#3191f6e0088eee07c4d8fd24e4d27a40a60d9eb9",
+    "browserify": "github:DefinitelyTyped/DefinitelyTyped/browserify/browserify.d.ts",
     "mocha": "github:Bartvds/tsd-deftools/typings/DefinitelyTyped/mocha/mocha.d.ts",
-    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#3191f6e0088eee07c4d8fd24e4d27a40a60d9eb9"
+    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts"
   }
 }