update npmts and switch to npmts version 2.x.x

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

@@ -22,7 +22,7 @@ var GulpBrowserBrowserify;
     }
     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

@@ -4,7 +4,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)",
@@ -33,6 +33,6 @@
   "devDependencies": {
     "gulp": "3.9.0",
     "gulp-callfunction": "0.0.10",
-    "npmts": "^1.0.9"
+    "npmts": "^2.0.0"
   }
 }

test/test.js

@@ -1,4 +1,4 @@
-/// <reference path="./typings/tsd.d.ts" />
+/// <reference path="./typings/main.d.ts" />
 var plugins = {
     beautylog: require("beautylog"),
     gulp: require("gulp"),

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/test.ts

@@ -1,4 +1,4 @@
-/// <reference path="./typings/tsd.d.ts" />
+/// <reference path="./typings/main.d.ts" />
 
 var plugins = {
     beautylog: require("beautylog"),

ts/typings.json

@@ -0,0 +1,6 @@
+{
+  "ambientDependencies": {
+    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#3191f6e0088eee07c4d8fd24e4d27a40a60d9eb9",
+    "browserify": "github:DefinitelyTyped/DefinitelyTyped/browserify/browserify.d.ts#3191f6e0088eee07c4d8fd24e4d27a40a60d9eb9"
+  }
+}

ts/typings/browser.d.ts

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

ts/typings/browser/ambient/browserify/browserify.d.ts

@@ -1,9 +1,10 @@
+// Compiled using typings@0.6.3
+// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/3191f6e0088eee07c4d8fd24e4d27a40a60d9eb9/browserify/browserify.d.ts
 // 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;
@@ -38,4 +39,4 @@ interface Browserify {
 declare module "browserify" {
   var browserify: Browserify;
   export = browserify;
-}
+}

ts/typings/browser/ambient/node/node.d.ts

@@ -1,3 +1,5 @@
+// Compiled using typings@0.6.3
+// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/3191f6e0088eee07c4d8fd24e4d27a40a60d9eb9/node/node.d.ts
 // Type definitions for Node.js v0.12.0
 // Project: http://nodejs.org/
 // Definitions by: Microsoft TypeScript <http://typescriptlang.org>, DefinitelyTyped <https://github.com/borisyankov/DefinitelyTyped>
@@ -2089,4 +2091,4 @@ declare module "constants" {
     export var W_OK: number;
     export var X_OK: number;
     export var UV_UDP_REUSEADDR: number;
-}
+}

ts/typings/main.d.ts

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

ts/typings/main/ambient/browserify/browserify.d.ts

@@ -0,0 +1,42 @@
+// Compiled using typings@0.6.3
+// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/3191f6e0088eee07c4d8fd24e4d27a40a60d9eb9/browserify/browserify.d.ts
+// Type definitions for Browserify
+// Project: http://browserify.org/
+// Definitions by: Andrew Gaspar <https://github.com/AndrewGaspar/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+
+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" />