diff --git a/dist/npmts.compile.js b/dist/npmts.compile.js index 7806eeb..10f74be 100644 --- a/dist/npmts.compile.js +++ b/dist/npmts.compile.js @@ -11,11 +11,11 @@ exports.run = function (configArg) { .then(() => { plugins.beautylog.ok('compiled main TypeScript!'); plugins.beautylog.log('now compiling tests!'); - return plugins.tsn.compileGlobStringObject(config.testTs); + return plugins.tsn.compileGlobStringObject(config.testTs, config.tsOptions, paths.cwd); }) .then(function () { plugins.beautylog.ok('compiled all TypeScript!'); done.resolve(config); - }); + }).catch(err => { console.log(err); }); return done.promise; }; diff --git a/dist/npmts.tests.js b/dist/npmts.tests.js index 8ff5458..8378f26 100644 --- a/dist/npmts.tests.js +++ b/dist/npmts.tests.js @@ -39,7 +39,6 @@ let mocha = function (configArg) { localSmartstream.run() .then(() => { done.resolve(configArg); }, (err) => { plugins.beautylog.error('Tests failed!'); - configArg.watch = true; if (configArg.watch) { done.resolve(configArg); } diff --git a/gitbook/config.md b/docs/config.md similarity index 100% rename from gitbook/config.md rename to docs/config.md diff --git a/gitbook/default.md b/docs/default.md similarity index 100% rename from gitbook/default.md rename to docs/default.md diff --git a/gitbook/examples.md b/docs/examples.md similarity index 100% rename from gitbook/examples.md rename to docs/examples.md diff --git a/gitbook/info.md b/docs/info.md similarity index 100% rename from gitbook/info.md rename to docs/info.md diff --git a/gitbook/install.md b/docs/install.md similarity index 100% rename from gitbook/install.md rename to docs/install.md diff --git a/gitbook/summary.md b/docs/summary.md similarity index 100% rename from gitbook/summary.md rename to docs/summary.md diff --git a/gitbook/book.json b/gitbook/book.json deleted file mode 100644 index 2bd173f..0000000 --- a/gitbook/book.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "structure": { - "readme": "index.md" - }, - "plugins": [ - "tonic", - "edit-link" - ], - "pluginsConfig": { - "edit-link": { - "base": "https://gitlab.com/pushrocks/npmts/edit/master/docs/", - "label": "Edit on GitLab" - } - } -} \ No newline at end of file diff --git a/gitbook/index.md b/gitbook/index.md deleted file mode 100644 index ab0ede0..0000000 --- a/gitbook/index.md +++ /dev/null @@ -1,42 +0,0 @@ -# npmts -Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6. - -## Availabililty -[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmts) -[![git](https://push.rocks/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/npmts) -[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/npmts) -[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/npmts/gitbook) - -## Status for master -[![build status](https://gitlab.com/pushrocks/npmts/badges/master/build.svg)](https://gitlab.com/pushrocks/npmts/commits/master) -[![coverage report](https://gitlab.com/pushrocks/npmts/badges/master/coverage.svg)](https://gitlab.com/pushrocks/npmts/commits/master) -[![Dependency Status](https://david-dm.org/pushrocks/npmts.svg)](https://david-dm.org/pushrocks/npmts) -[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/npmts/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/npmts/master/dependencies/npm) -[![bitHound Code](https://www.bithound.io/github/pushrocks/npmts/badges/code.svg)](https://www.bithound.io/github/pushrocks/npmts) -[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/) -[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/) -[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/) - -## Introduction -NPMTS is your friend when writing, testing, publishing and documenting npm modules written in TypeScript. - -npmts will - -1. check your dependencies and package.json -1. transpile your code with tsc, -1. document your code with typedoc, -1. test your code with mocha -1. create coverage with istanbul - -This works on your machine and in CI. There is a prebuild docker image available that includes npmts to make CI a breeze: -[hosttoday/ht-docker-node:npmts on Dockerhub](https://hub.docker.com/r/hosttoday/ht-docker-node/) - -For further information read the docs: - * [1. Intro](https://pushrocks.gitlab.io/npmts/gitbook/index.md) - * [2. Install](https://pushrocks.gitlab.io/npmts/gitbook/install.md) - * [3. Default Behaviour](https://pushrocks.gitlab.io/npmts/gitbook/default.md) - * [4. Configuration](https://pushrocks.gitlab.io/npmts/gitbook/config.md) - * [5. Examples](https://pushrocks.gitlab.io/npmts/gitbook/examples.md) - * [6. Info](https://pushrocks.gitlab.io/npmts/gitbook/info.md) - -[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks) diff --git a/ts/npmts.compile.ts b/ts/npmts.compile.ts index 5cb9bb6..cff8bf2 100644 --- a/ts/npmts.compile.ts +++ b/ts/npmts.compile.ts @@ -11,11 +11,11 @@ export let run = function (configArg) { .then(() => { plugins.beautylog.ok('compiled main TypeScript!') plugins.beautylog.log('now compiling tests!') - return plugins.tsn.compileGlobStringObject(config.testTs) + return plugins.tsn.compileGlobStringObject(config.testTs,config.tsOptions,paths.cwd) }) .then(function () { plugins.beautylog.ok('compiled all TypeScript!') done.resolve(config) - }) + }).catch(err => { console.log(err) }) return done.promise }