3.1.2

index.d.ts

@@ -6,7 +6,6 @@ declare module NpmtsPlugins {
         gulp: any;
         g: {
             coveralls: any;
-            header: any;
             istanbul: any;
             mocha: any;
             sourcemaps: any;
@@ -45,7 +44,6 @@ declare var plugins: {
     gulp: any;
     g: {
         coveralls: any;
-        header: any;
         istanbul: any;
         mocha: any;
         sourcemaps: any;

index.js

@@ -10,7 +10,6 @@ var NpmtsPlugins;
             gulp: require("gulp"),
             g: {
                 coveralls: require("gulp-coveralls"),
-                header: require("gulp-header"),
                 istanbul: require("gulp-istanbul"),
                 mocha: require("gulp-mocha"),
                 sourcemaps: require("gulp-sourcemaps"),
@@ -167,21 +166,15 @@ var NpmtsCompile;
                         return plugins.path.join(paths.cwd, config.ts[key]);
                     }
                 })();
-                var tsStream = plugins.gulp.src([plugins.path.join(paths.cwd, key), "!**/typings/**"])
+                var stream = plugins.gulp.src([plugins.path.join(paths.cwd, key), "!**/typings/**"])
                     .pipe(plugins.g.sourcemaps.init()) // This means sourcemaps will be generated
                     .pipe(plugins.g.typescript({
                     out: outputName,
-                    declaration: true,
                     target: "ES5",
                     module: "commonjs"
-                }));
-                var stream = plugins.mergeStream([
-                    tsStream.dts.pipe(plugins.gulp.dest(outputDir)),
-                    tsStream.js
-                        .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
-                        .pipe(plugins.g.header('#!/usr/bin/env node\n\n'))
-                        .pipe(plugins.gulp.dest(outputDir))
-                ]);
+                }))
+                    .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
+                    .pipe(plugins.gulp.dest(outputDir));
                 moduleStream.add(stream);
             }
             moduleStream.on("queueDrain", function () {
@@ -202,7 +195,7 @@ var NpmtsTests;
         var done = plugins.q.defer();
         var config = configArg;
         var istanbul = function () {
-            var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "dist/index.js")])
+            var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "dist/*.js")])
                 .pipe(plugins.g.istanbul())
                 .pipe(plugins.g.istanbul.hookRequire());
             return stream;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "3.0.1",
+  "version": "3.1.2",
   "description": "write npm modules with TypeScript",
   "main": "index.js",
   "typings": "./index.d.ts",
@@ -30,7 +30,6 @@
     "fs-extra": "^0.26.5",
     "gulp": "3.9.1",
     "gulp-coveralls": "^0.1.4",
-    "gulp-header": "^1.7.1",
     "gulp-istanbul": "^0.10.3",
     "gulp-mocha": "^2.2.0",
     "gulp-sourcemaps": "^1.6.0",
@@ -42,5 +41,8 @@
     "smartfile": "0.0.11",
     "source-map-support": "^0.4.0",
     "typings": "^0.6.8"
+  },
+  "devDependencies": {
+    "gulp-header": "^1.7.1"
   }
 }

test/assets/dist/index.d.ts

@@ -1,4 +0,0 @@
-/// <reference path="typings/main.d.ts" />
-declare var testplugin: {
-    logSomething: () => void;
-};

test/assets/dist/index.js

@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 /// <reference path="./typings/main.d.ts" />
 var testplugin = {
     logSomething: function () {

test/assets/test/test.js

@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 /// <reference path="../ts/typings/main.d.ts" />
 console.log("**** starting test ****");
 var testplugin = require("../dist/index.js");

ts/npmts.compile.ts

@@ -67,21 +67,16 @@ module NpmtsCompile {
                     }
                 })();
 
-                var tsStream = plugins.gulp.src([plugins.path.join(paths.cwd,key),"!**/typings/**"])
+                var stream = plugins.gulp.src([plugins.path.join(paths.cwd,key),"!**/typings/**"])
                     .pipe(plugins.g.sourcemaps.init()) // This means sourcemaps will be generated
                     .pipe(plugins.g.typescript({
                         out: outputName,
-                        declaration: true,
                         target: "ES5",
                         module: "commonjs"
-                    }));
-                var stream = plugins.mergeStream([
-                    tsStream.dts.pipe(plugins.gulp.dest(outputDir)),
-                    tsStream.js
-                        .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
-                        .pipe(plugins.g.header('#!/usr/bin/env node\n\n'))
-                        .pipe(plugins.gulp.dest(outputDir))
-                ]);
+                    }))
+                    .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
+                    //.pipe(plugins.g.header('#!/usr/bin/env node\n\n'))
+                    .pipe(plugins.gulp.dest(outputDir));
                 moduleStream.add(stream);
             }
             moduleStream.on("queueDrain",function(){

ts/npmts.plugins.ts

@@ -7,7 +7,6 @@ module NpmtsPlugins {
             gulp: require("gulp"),
             g: {
                 coveralls: require("gulp-coveralls"),
-                header: require("gulp-header"),
                 istanbul: require("gulp-istanbul"),
                 mocha: require("gulp-mocha"),
                 sourcemaps: require("gulp-sourcemaps"),