Compare commits

...

7 Commits

Author SHA1 Message Date
51753df662 5.4.7 2016-08-13 23:54:27 +02:00
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
b2aaa51882 5.4.4 2016-08-02 15:49:20 +02:00
8ee6623984 now getting missing devDependencies as well 2016-08-02 15:49:16 +02:00
9 changed files with 70 additions and 50 deletions

19
dist/npmts.check.js vendored
View File

@ -55,18 +55,13 @@ var checkDependencies = function (configArg) {
plugins.beautylog.info("exiting due to missing dependencies in package.json");
process.exit(1);
}
for (var _d = 0, _e = unused.using; _d < _e.length; _d++) {
for (var _d = 0, _e = unused.invalidFiles; _d < _e.length; _d++) {
var item = _e[_d];
console.log(item);
}
;
for (var _f = 0, _g = unused.invalidFiles; _f < _g.length; _f++) {
var item = _g[_f];
plugins.beautylog.warn("Watch out: could not parse file " + item.red);
}
;
for (var _h = 0, _j = unused.invalidDirs; _h < _j.length; _h++) {
var item = _j[_h];
for (var _f = 0, _g = unused.invalidDirs; _f < _g.length; _f++) {
var item = _g[_f];
plugins.beautylog.warn("Watch out: could not parse directory " + item.red);
}
;
@ -93,11 +88,15 @@ var checkDevDependencies = function (configArg) {
plugins.beautylog.log("unused devDependency " + item.red);
}
;
for (var _b = 0, _c = unused.using; _b < _c.length; _b++) {
for (var _b = 0, _c = unused.missing; _b < _c.length; _b++) {
var item = _c[_b];
console.log(item);
plugins.beautylog.error("unused devDependency " + item.red);
}
;
if (unused.missing.length > 0) {
plugins.beautylog.info("exiting due to missing dependencies in package.json");
process.exit(1);
}
for (var _d = 0, _e = unused.invalidFiles; _d < _e.length; _d++) {
var item = _e[_d];
plugins.beautylog.warn("Watch out: could not parse file " + item.red);

View File

@ -8,12 +8,17 @@ exports.run = function (argvArg) {
npmts_promisechain_1.npmtsOra.text("looking for npmextra.json");
var defaultConfig = {
mode: "default",
notest: false
notest: false,
nodocs: false
};
if (argvArg.notest) {
defaultConfig.notest = true;
}
;
if (argvArg.nodocs) {
defaultConfig.nodocs = true;
}
;
var config = plugins.npmextra.dataFor({
toolName: "npmts",
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")])
.pipe(plugins.g.babel({
presets: [
plugins.path.join(paths.npmtsPackageRoot, "node_modules/babel-preset-es2015/index.js")
require.resolve("babel-preset-es2015")
]
}))
.pipe(plugins.g.injectModules())

View File

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

View File

@ -1,18 +1,19 @@
{
"name": "npmts",
"version": "5.4.3",
"version": "5.4.7",
"description": "Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.",
"main": "dist/index.js",
"bin": {
"npmts": "dist/cli.js"
},
"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/ )",
"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)",
"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": {
"type": "git",

View File

@ -52,9 +52,6 @@ let checkDependencies = (configArg) => {
plugins.beautylog.info("exiting due to missing dependencies in package.json");
process.exit(1);
}
for (let item of unused.using) {
console.log(item);
};
for (let item of unused.invalidFiles) {
plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`);
};
@ -83,9 +80,13 @@ let checkDevDependencies = (configArg) => {
for (let item of unused.devDependencies) {
plugins.beautylog.log(`unused devDependency ${item.red}`);
};
for (let item of unused.using) {
console.log(item);
for (let item of unused.missing) {
plugins.beautylog.error(`unused devDependency ${item.red}`);
};
if (unused.missing.length > 0) {
plugins.beautylog.info("exiting due to missing dependencies in package.json");
process.exit(1);
}
for (let item of unused.invalidFiles) {
plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`);
};

View File

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

View File

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

View File

@ -1,13 +1,13 @@
import "typings-global";
import plugins = require("./npmts.plugins");
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();
npmtsOra.text("now generating " + "TypeDoc documentation".yellow);
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({
// TypeScript options (see typescript docs)
module: "commonjs",
@ -16,7 +16,7 @@ let genTypeDoc = function(configArg){
// Output options (see typedoc docs)
out: paths.docsDir,
json: plugins.path.join(paths.docsDir,"file.json"),
json: plugins.path.join(paths.docsDir, "file.json"),
// TypeDoc options (see typedoc docs)
name: "my-project",
@ -25,16 +25,20 @@ let genTypeDoc = function(configArg){
ignoreCompilerErrors: true,
version: true,
}))
.pipe(plugins.g.gFunction(done.resolve,"atEnd"));
.pipe(plugins.g.gFunction(done.resolve, "atEnd"));
return done.promise;
};
export let run = function(configArg){
export let run = function (configArg) {
let done = plugins.Q.defer();
if (configArg.nodocs) {
done.resolve(configArg);
} else {
genTypeDoc(configArg)
.then(() => {
done.resolve(configArg);
});
};
return done.promise;
};