Compare commits

...

7 Commits

Author SHA1 Message Date
cb3f343c92 3.1.0 2016-02-19 01:24:46 +01:00
6227e47037 straighten up ts compilation 2016-02-19 01:24:25 +01:00
2730ca4299 3.0.3 2016-02-18 22:43:50 +01:00
07aae64965 fix sourcemaps 2016-02-18 22:43:40 +01:00
56841d5bb0 3.0.2 2016-02-18 12:55:35 +01:00
40301ede35 disable declaration files for now 2016-02-18 12:55:24 +01:00
70213b04bc disable declaration files for now 2016-02-18 12:55:00 +01:00
6 changed files with 11 additions and 31 deletions

View File

@ -167,21 +167,15 @@ var NpmtsCompile;
return plugins.path.join(paths.cwd, config.ts[key]); 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.sourcemaps.init()) // This means sourcemaps will be generated
.pipe(plugins.g.typescript({ .pipe(plugins.g.typescript({
out: outputName, out: outputName,
declaration: true,
target: "ES5", target: "ES5",
module: "commonjs" module: "commonjs"
})); }))
var stream = plugins.mergeStream([ .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
tsStream.dts.pipe(plugins.gulp.dest(outputDir)), .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))
]);
moduleStream.add(stream); moduleStream.add(stream);
} }
moduleStream.on("queueDrain", function () { moduleStream.on("queueDrain", function () {
@ -202,7 +196,7 @@ var NpmtsTests;
var done = plugins.q.defer(); var done = plugins.q.defer();
var config = configArg; var config = configArg;
var istanbul = function () { 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())
.pipe(plugins.g.istanbul.hookRequire()); .pipe(plugins.g.istanbul.hookRequire());
return stream; return stream;

View File

@ -1,6 +1,6 @@
{ {
"name": "npmts", "name": "npmts",
"version": "3.0.1", "version": "3.1.0",
"description": "write npm modules with TypeScript", "description": "write npm modules with TypeScript",
"main": "index.js", "main": "index.js",
"typings": "./index.d.ts", "typings": "./index.d.ts",
@ -30,7 +30,6 @@
"fs-extra": "^0.26.5", "fs-extra": "^0.26.5",
"gulp": "3.9.1", "gulp": "3.9.1",
"gulp-coveralls": "^0.1.4", "gulp-coveralls": "^0.1.4",
"gulp-header": "^1.7.1",
"gulp-istanbul": "^0.10.3", "gulp-istanbul": "^0.10.3",
"gulp-mocha": "^2.2.0", "gulp-mocha": "^2.2.0",
"gulp-sourcemaps": "^1.6.0", "gulp-sourcemaps": "^1.6.0",

View File

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

View File

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

View File

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

View File

@ -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.sourcemaps.init()) // This means sourcemaps will be generated
.pipe(plugins.g.typescript({ .pipe(plugins.g.typescript({
out: outputName, out: outputName,
declaration: true,
target: "ES5", target: "ES5",
module: "commonjs" module: "commonjs"
})); }))
var stream = plugins.mergeStream([ .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
tsStream.dts.pipe(plugins.gulp.dest(outputDir)), //.pipe(plugins.g.header('#!/usr/bin/env node\n\n'))
tsStream.js .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.add(stream);
} }
moduleStream.on("queueDrain",function(){ moduleStream.on("queueDrain",function(){