Compare commits

...

4 Commits

Author SHA1 Message Date
36c002581a 5.4.6 2016-08-13 23:54:21 +02:00
db1cfe4746 add --nodocs option 2016-08-13 23:54:17 +02:00
2c254a2ecf 5.4.5 2016-08-13 22:23:22 +02:00
425bc6150a now using require.resolve for getting babel plugins. fixes local dependency issue. 2016-08-13 22:23:11 +02:00
7 changed files with 55 additions and 35 deletions

View File

@ -8,12 +8,17 @@ exports.run = function (argvArg) {
npmts_promisechain_1.npmtsOra.text("looking for npmextra.json"); npmts_promisechain_1.npmtsOra.text("looking for npmextra.json");
var defaultConfig = { var defaultConfig = {
mode: "default", mode: "default",
notest: false notest: false,
nodocs: false
}; };
if (argvArg.notest) { if (argvArg.notest) {
defaultConfig.notest = true; defaultConfig.notest = true;
} }
; ;
if (argvArg.nodocs) {
defaultConfig.nodocs = true;
}
;
var config = plugins.npmextra.dataFor({ var config = plugins.npmextra.dataFor({
toolName: "npmts", toolName: "npmts",
defaultSettings: defaultConfig, defaultSettings: defaultConfig,

2
dist/npmts.tests.js vendored
View File

@ -25,7 +25,7 @@ var mocha = function (configArg) {
plugins.gulp.src([plugins.path.join(paths.cwd, "test/test.js")]) plugins.gulp.src([plugins.path.join(paths.cwd, "test/test.js")])
.pipe(plugins.g.babel({ .pipe(plugins.g.babel({
presets: [ presets: [
plugins.path.join(paths.npmtsPackageRoot, "node_modules/babel-preset-es2015/index.js") require.resolve("babel-preset-es2015")
] ]
})) }))
.pipe(plugins.g.injectModules()) .pipe(plugins.g.injectModules())

12
dist/npmts.typedoc.js vendored
View File

@ -27,9 +27,15 @@ var genTypeDoc = function (configArg) {
}; };
exports.run = function (configArg) { exports.run = function (configArg) {
var done = plugins.Q.defer(); var done = plugins.Q.defer();
genTypeDoc(configArg) if (configArg.nodocs) {
.then(function () {
done.resolve(configArg); done.resolve(configArg);
}); }
else {
genTypeDoc(configArg)
.then(function () {
done.resolve(configArg);
});
}
;
return done.promise; return done.promise;
}; };

View File

@ -1,18 +1,19 @@
{ {
"name": "npmts", "name": "npmts",
"version": "5.4.4", "version": "5.4.6",
"description": "Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.", "description": "Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {
"npmts": "dist/cli.js" "npmts": "dist/cli.js"
}, },
"scripts": { "scripts": {
"test": "(npm run compile && npm run setupCheck && npm run check && npm run checkVersion && npm run checkNoTest)", "test": "(npm run compile && npm run setupCheck && npm run check && npm run checkVersion && npm run checkNoTest && npm run checkNoDocs)",
"compile": "(rm -rf test/ && rm -r dist/ && mkdir dist/ && tsc && cp assets/cli.js dist/ )", "compile": "(rm -rf test/ && rm -r dist/ && mkdir dist/ && tsc && cp assets/cli.js dist/ )",
"setupCheck": "(git clone https://gitlab.com/sandboxzone/sandbox-npmts.git test/)", "setupCheck": "(git clone https://gitlab.com/sandboxzone/sandbox-npmts.git test/)",
"check": "(cd test && node ../dist/index.js)", "check": "(cd test && npm install && node ../dist/index.js)",
"checkVersion": "(cd test/ && node ../dist/index.js -v)", "checkVersion": "(cd test/ && node ../dist/index.js -v)",
"checkNoTest": "(cd test && node ../dist/index.js --notest)" "checkNoTest": "(cd test && node ../dist/index.js --notest)",
"checkNoDocs": "(cd test && node ../dist/index.js --nodocs)"
}, },
"repository": { "repository": {
"type": "git", "type": "git",

View File

@ -7,11 +7,15 @@ export var run = function(argvArg){
npmtsOra.text("looking for npmextra.json"); npmtsOra.text("looking for npmextra.json");
let defaultConfig = { let defaultConfig = {
mode: "default", mode: "default",
notest:false notest:false,
nodocs:false
}; };
if(argvArg.notest){ if(argvArg.notest){
defaultConfig.notest = true; defaultConfig.notest = true;
}; };
if(argvArg.nodocs){
defaultConfig.nodocs = true;
};
let config = plugins.npmextra.dataFor({ let config = plugins.npmextra.dataFor({
toolName:"npmts", toolName:"npmts",
defaultSettings:defaultConfig, defaultSettings:defaultConfig,

View File

@ -26,7 +26,7 @@ let mocha = function (configArg) {
plugins.gulp.src([plugins.path.join(paths.cwd,"test/test.js")]) plugins.gulp.src([plugins.path.join(paths.cwd,"test/test.js")])
.pipe(plugins.g.babel({ .pipe(plugins.g.babel({
presets: [ presets: [
plugins.path.join(paths.npmtsPackageRoot,"node_modules/babel-preset-es2015/index.js") require.resolve("babel-preset-es2015")
] ]
})) }))
.pipe(plugins.g.injectModules()) .pipe(plugins.g.injectModules())

View File

@ -1,40 +1,44 @@
import "typings-global"; import "typings-global";
import plugins = require("./npmts.plugins"); import plugins = require("./npmts.plugins");
import paths = require("./npmts.paths"); import paths = require("./npmts.paths");
import {npmtsOra} from "./npmts.promisechain"; import { npmtsOra } from "./npmts.promisechain";
let genTypeDoc = function(configArg){ let genTypeDoc = function (configArg) {
let done = plugins.Q.defer(); let done = plugins.Q.defer();
npmtsOra.text("now generating " + "TypeDoc documentation".yellow); npmtsOra.text("now generating " + "TypeDoc documentation".yellow);
plugins.beautylog.log("TypeDoc Output:"); plugins.beautylog.log("TypeDoc Output:");
plugins.gulp.src(plugins.path.join(paths.tsDir,"**/*.ts")) plugins.gulp.src(plugins.path.join(paths.tsDir, "**/*.ts"))
.pipe(plugins.g.typedoc({ .pipe(plugins.g.typedoc({
// TypeScript options (see typescript docs) // TypeScript options (see typescript docs)
module: "commonjs", module: "commonjs",
target: "es6", target: "es6",
includeDeclarations: true, includeDeclarations: true,
// Output options (see typedoc docs) // Output options (see typedoc docs)
out: paths.docsDir, out: paths.docsDir,
json: plugins.path.join(paths.docsDir,"file.json"), json: plugins.path.join(paths.docsDir, "file.json"),
// TypeDoc options (see typedoc docs) // TypeDoc options (see typedoc docs)
name: "my-project", name: "my-project",
//theme: "default", //theme: "default",
ignoreCompilerErrors: true, ignoreCompilerErrors: true,
version: true, version: true,
})) }))
.pipe(plugins.g.gFunction(done.resolve,"atEnd")); .pipe(plugins.g.gFunction(done.resolve, "atEnd"));
return done.promise; return done.promise;
}; };
export let run = function(configArg){ export let run = function (configArg) {
let done = plugins.Q.defer(); let done = plugins.Q.defer();
genTypeDoc(configArg) if (configArg.nodocs) {
.then(() => { done.resolve(configArg);
done.resolve(configArg); } else {
}); genTypeDoc(configArg)
.then(() => {
done.resolve(configArg);
});
};
return done.promise; return done.promise;
}; };