fix tsn issue

This commit is contained in:
Philipp Kunz 2016-09-29 16:19:49 +02:00
parent 86fb639c82
commit 9229cd79dd
5 changed files with 51 additions and 14 deletions

18
dist/npmts.clean.js vendored
View File

@ -3,10 +3,27 @@ require("typings-global");
const plugins = require("./npmts.plugins"); const plugins = require("./npmts.plugins");
const paths = require("./npmts.paths"); const paths = require("./npmts.paths");
const npmts_promisechain_1 = require("./npmts.promisechain"); const npmts_promisechain_1 = require("./npmts.promisechain");
/**
* removes the dist directory which will be entirely rebuild
*/
let removeDist = function () { let removeDist = function () {
npmts_promisechain_1.npmtsOra.text('cleaning dist folder'); npmts_promisechain_1.npmtsOra.text('cleaning dist folder');
return plugins.smartfile.fs.remove(paths.distDir); return plugins.smartfile.fs.remove(paths.distDir);
}; };
/**
* remove .d.ts files from testDirctory
*/
let removeTestDeclarations = function () {
let done = plugins.q.defer();
plugins.smartfile.fs.listFileTree('./test/', '**/*.d.ts').then(fileArray => {
let fileArrayToRemove = plugins.smartpath.transform.toAbsolute(fileArray, process.cwd() + '//test/');
plugins.smartfile.fs.removeManySync(fileArrayToRemove);
done.resolve();
});
};
/**
* remove old pages
*/
let removePages = function () { let removePages = function () {
npmts_promisechain_1.npmtsOra.text('cleaning pages folder'); npmts_promisechain_1.npmtsOra.text('cleaning pages folder');
return plugins.smartfile.fs.remove(paths.pagesDir); return plugins.smartfile.fs.remove(paths.pagesDir);
@ -15,6 +32,7 @@ exports.run = function (configArg) {
npmts_promisechain_1.npmtsOra.text('cleaning up from previous builds...'); npmts_promisechain_1.npmtsOra.text('cleaning up from previous builds...');
let done = plugins.q.defer(); let done = plugins.q.defer();
removeDist() removeDist()
.then(removeTestDeclarations)
.then(removePages) .then(removePages)
.then(function () { .then(function () {
plugins.beautylog.ok('Cleaned up from previous builds!'); plugins.beautylog.ok('Cleaned up from previous builds!');

View File

@ -38,10 +38,10 @@ exports.run = function (argvArg) {
// handle default mode // handle default mode
if (config.mode === 'default') { if (config.mode === 'default') {
config.ts = { config.ts = {
['./ts/**/*.ts']: './dist/' './ts/**/*.ts': './dist/'
}; };
config.testTs = { config.testTs = {
['./test/test.ts']: './test/' './test/**/*.ts': './test/'
}; };
} }
; ;

View File

@ -38,7 +38,7 @@
"@types/minimatch": "^2.0.29", "@types/minimatch": "^2.0.29",
"@types/q": "^0.x.x", "@types/q": "^0.x.x",
"@types/shelljs": "^0.3.31", "@types/shelljs": "^0.3.31",
"babel-preset-es2015": "^6.14.0", "babel-preset-es2015": "^6.16.0",
"beautylog": "5.0.23", "beautylog": "5.0.23",
"depcheck": "^0.6.4", "depcheck": "^0.6.4",
"early": "^2.0.35", "early": "^2.0.35",
@ -50,7 +50,7 @@
"gulp-mocha": "^3.0.1", "gulp-mocha": "^3.0.1",
"gulp-sourcemaps": "^1.6.0", "gulp-sourcemaps": "^1.6.0",
"gulp-typedoc": "^2.0.0", "gulp-typedoc": "^2.0.0",
"lodash": "^4.16.1", "lodash": "^4.16.2",
"npmextra": "^2.0.3", "npmextra": "^2.0.3",
"projectinfo": "1.0.3", "projectinfo": "1.0.3",
"q": "^1.4.1", "q": "^1.4.1",
@ -59,12 +59,12 @@
"smartcli": "1.0.9", "smartcli": "1.0.9",
"smartcov": "1.0.0", "smartcov": "1.0.0",
"smartenv": "1.2.5", "smartenv": "1.2.5",
"smartfile": "4.0.21", "smartfile": "4.0.22",
"smartpath": "3.2.2", "smartpath": "3.2.2",
"smartstream": "^1.0.5", "smartstream": "^1.0.5",
"smartstring": "^2.0.17", "smartstring": "^2.0.17",
"source-map-support": "^0.4.2", "source-map-support": "^0.4.3",
"tsn": "^2.0.3", "tsn": "^2.0.4",
"typedoc": "^0.4.5", "typedoc": "^0.4.5",
"typescript": "next", "typescript": "next",
"typings-global": "^1.0.14" "typings-global": "^1.0.14"

View File

@ -1,24 +1,43 @@
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 removeDist = function(){ /**
* removes the dist directory which will be entirely rebuild
*/
let removeDist = function () {
npmtsOra.text('cleaning dist folder') npmtsOra.text('cleaning dist folder')
return plugins.smartfile.fs.remove(paths.distDir) return plugins.smartfile.fs.remove(paths.distDir)
} }
let removePages = function(){ /**
* remove .d.ts files from testDirctory
*/
let removeTestDeclarations = function () {
let done = plugins.q.defer()
plugins.smartfile.fs.listFileTree('./test/', '**/*.d.ts').then(fileArray => {
let fileArrayToRemove = plugins.smartpath.transform.toAbsolute(fileArray, process.cwd() + '//test/')
plugins.smartfile.fs.removeManySync(fileArrayToRemove)
done.resolve()
})
}
/**
* remove old pages
*/
let removePages = function () {
npmtsOra.text('cleaning pages folder') npmtsOra.text('cleaning pages folder')
return plugins.smartfile.fs.remove(paths.pagesDir) return plugins.smartfile.fs.remove(paths.pagesDir)
} }
export let run = function(configArg){ export let run = function (configArg) {
npmtsOra.text('cleaning up from previous builds...') npmtsOra.text('cleaning up from previous builds...')
let done = plugins.q.defer() let done = plugins.q.defer()
removeDist() removeDist()
.then(removeTestDeclarations)
.then(removePages) .then(removePages)
.then(function(){ .then(function () {
plugins.beautylog.ok('Cleaned up from previous builds!') plugins.beautylog.ok('Cleaned up from previous builds!')
done.resolve(configArg) done.resolve(configArg)
}) })

View File

@ -59,10 +59,10 @@ export var run = function (argvArg) {
// handle default mode // handle default mode
if (config.mode === 'default') { if (config.mode === 'default') {
config.ts = { config.ts = {
['./ts/**/*.ts']: './dist/' './ts/**/*.ts': './dist/'
} }
config.testTs = { config.testTs = {
['./test/test.ts']: './test/' './test/**/*.ts': './test/'
} }
}; };