1.0.7

.gitignore

@@ -5,5 +5,6 @@ npm-debug.log
 
 ts/*.js
 ts/*.js.map
+ts/typings/
 
 test/result/

.travis.yml

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

index.d.ts

@@ -1,4 +1,4 @@
-/// <reference path="ts/typings/tsd.d.ts" />
+/// <reference path="ts/typings/main.d.ts" />
 declare module GulpBrowserBrowserify {
     function init(): () => any;
 }

index.js

@@ -15,14 +15,14 @@ var GulpBrowserBrowserify;
                     }
                     cb(null, file);
                 };
-                plugins.browserify(file)
+                plugins.browserify(file, { basedir: file.base })
                     .bundle(bundleCallback);
             });
         };
     }
     GulpBrowserBrowserify.init = init;
 })(GulpBrowserBrowserify || (GulpBrowserBrowserify = {}));
-/// <reference path="./typings/tsd.d.ts" />
+/// <reference path="./typings/main.d.ts" />
 /// <reference path="./modulebrowserify.ts" />
 var plugins = {
     beautylog: require("beautylog"),

package.json

@@ -1,10 +1,10 @@
 {
   "name": "gulp-browser",
-  "version": "1.0.2",
+  "version": "1.0.7",
   "description": "browserify and other goodies for gulp",
   "main": "index.js",
   "scripts": {
-    "test": "(npmts) && (node test.js)",
+    "test": "(npmts)",
     "reinstall": "(rm -r node_modules && npm install)",
     "release": "(git pull origin master && npm version patch && git push origin master && git checkout release && git merge master && git push origin release && git checkout master)",
     "update": "(git checkout master && git pull origin master && npm install)",
@@ -25,14 +25,14 @@
   },
   "homepage": "https://github.com/pushrocks/gulp-browser",
   "dependencies": {
+    "beautylog": "2.0.6",
     "browserify": "13.0.0",
     "gulp-util": "3.0.7",
     "through2": "2.0.0"
   },
   "devDependencies": {
-    "beautylog": "2.0.2",
     "gulp": "3.9.0",
-    "gulp-callfunction": "0.0.10",
-    "npmts": "^1.0.9"
+    "gulp-function": "1.0.2",
+    "npmts": "^2.0.3"
   }
 }

test.js

@@ -1,29 +0,0 @@
-/// <reference path="./typings/tsd.d.ts" />
-var plugins = {
-    beautylog: require("beautylog"),
-    gulp: require("gulp"),
-    gulpBrowser: require("./index.js"),
-    gulpCallFunction: require("gulp-callfunction")
-};
-var pipeWorked = function () {
-    plugins.beautylog.info("Pipe didn't break! Ready for Primetime!");
-};
-plugins.beautylog.log('Now trying to browserify a testfile...');
-plugins.gulp.task('gulpBrowserTest', function (cb) {
-    var stream = plugins.gulp.src('./test/browserifyGulpTest.js')
-        .pipe(plugins.gulpBrowser.browserify())
-        .pipe(plugins.gulp.dest("./test/result/"))
-        .pipe(plugins.gulpCallFunction(pipeWorked));
-    return stream;
-});
-plugins.gulp.task('gulpBrowserTestError', function (cb) {
-    var stream = plugins.gulp.src('./test/browserifyGulpTestError.js')
-        .pipe(plugins.gulpBrowser.browserify())
-        .pipe(plugins.gulp.dest("./test/result/"))
-        .pipe(plugins.gulpCallFunction(pipeWorked));
-    return stream;
-});
-plugins.gulp.task("default", ['gulpBrowserTest', 'gulpBrowserTestError'], function () {
-    plugins.beautylog.success("Test passed!");
-});
-plugins.gulp.start.apply(plugins.gulp, ['default']);

test/test.js

@@ -0,0 +1,29 @@
+/// <reference path="./typings/main.d.ts" />
+var plugins = {
+    beautylog: require("beautylog"),
+    gulp: require("gulp"),
+    gulpBrowser: require("../index.js"),
+    gulpFunction: require("gulp-function")
+};
+describe("gulpBrowser", function () {
+    describe(".browserify", function () {
+        it("should run through smoothly", function (done) {
+            this.timeout(15000);
+            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.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/index.ts

@@ -1,4 +1,4 @@
-/// <reference path="./typings/tsd.d.ts" />
+/// <reference path="./typings/main.d.ts" />
 /// <reference path="./modulebrowserify.ts" />
 
 var plugins = {

ts/modulebrowserify.ts

@@ -11,7 +11,7 @@ module GulpBrowserBrowserify {
                     }
                     cb(null,file);
                 };
-                plugins.browserify(file)
+                plugins.browserify(file, { basedir: file.base })
                     .bundle(bundleCallback)
             });
         };

ts/test.ts

@@ -1,33 +1,31 @@
-/// <reference path="./typings/tsd.d.ts" />
-
+/// <reference path="./typings/main.d.ts" />
 var plugins = {
     beautylog: require("beautylog"),
     gulp: require("gulp"),
-    gulpBrowser: require("./index.js"),
-    gulpCallFunction: require("gulp-callfunction")
+    gulpBrowser: require("../index.js"),
+    gulpFunction: require("gulp-function")
 };
 
-
-var pipeWorked = function() {
-    plugins.beautylog.info("Pipe didn't break! Ready for Primetime!");
-};
-
-plugins.beautylog.log('Now trying to browserify a testfile...');
-plugins.gulp.task('gulpBrowserTest',function(cb) {
-    var stream = plugins.gulp.src('./test/browserifyGulpTest.js')
-        .pipe(plugins.gulpBrowser.browserify())
-        .pipe(plugins.gulp.dest("./test/result/"))
-        .pipe(plugins.gulpCallFunction(pipeWorked));
-    return stream;
+describe("gulpBrowser",function(){
+    describe(".browserify",function(){
+        it("should run through smoothly",function(done){
+            this.timeout(20000);
+            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.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/"))
-        .pipe(plugins.gulpCallFunction(pipeWorked));
+        .pipe(plugins.gulp.dest("./test/result/"));
     return stream;
 });
-plugins.gulp.task("default",['gulpBrowserTest','gulpBrowserTestError'],function(){
-    plugins.beautylog.success("Test passed!");
-});
-plugins.gulp.start.apply(plugins.gulp, ['default']);

ts/typings.json

@@ -0,0 +1,7 @@
+{
+  "ambientDependencies": {
+    "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"
+  }
+}

ts/typings/browserify/browserify.d.ts

@@ -1,41 +0,0 @@
-// Type definitions for Browserify
-// Project: http://browserify.org/
-// Definitions by: Andrew Gaspar <https://github.com/AndrewGaspar/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-interface BrowserifyObject extends NodeJS.EventEmitter {
-  add(file:string, opts?:any): BrowserifyObject;
-  require(file:string, opts?:{
-    expose: string;
-  }): BrowserifyObject;
-  bundle(opts?:{
-    insertGlobals?: boolean;
-    detectGlobals?: boolean;
-    debug?: boolean;
-    standalone?: string;
-    insertGlobalVars?: any;
-  }, cb?:(err:any, src:any) => void): NodeJS.ReadableStream;
-
-  external(file:string, opts?:any): BrowserifyObject;
-  ignore(file:string, opts?:any): BrowserifyObject;
-  transform(tr:string, opts?:any): BrowserifyObject;
-  transform(tr:Function, opts?:any): BrowserifyObject;
-  plugin(plugin:string, opts?:any): BrowserifyObject;
-  plugin(plugin:Function, opts?:any): BrowserifyObject;
-}
-
-interface Browserify {
-  (): BrowserifyObject;
-  (files:string[]): BrowserifyObject;
-  (opts:{
-    entries?: string[];
-    noParse?: string[];
-  }): BrowserifyObject;
-}
-
-declare module "browserify" {
-  var browserify: Browserify;
-  export = browserify;
-}

ts/typings/tsd.d.ts

@@ -1,2 +0,0 @@
-/// <reference path="node/node.d.ts" />
-/// <reference path="browserify/browserify.d.ts" />