Compare commits
32 Commits
Author | SHA1 | Date | |
---|---|---|---|
cf4db90aef | |||
8896d3ef76 | |||
c0b7dc2547 | |||
d65f19d108 | |||
5de4646453 | |||
44e9fcc977 | |||
784aec1ec3 | |||
61b7bbb168 | |||
1d662ddef4 | |||
f7351c914e | |||
7132ae11a8 | |||
b195b8911b | |||
e331e870d9 | |||
3a6bd3b583 | |||
594bccfc82 | |||
d9f1d36d14 | |||
f12c4aabd8 | |||
b62f7d8b31 | |||
56cccb1b14 | |||
850df45d7f | |||
2b1f371d8a | |||
8196ca50a7 | |||
ad96661dda | |||
2fc6c3d358 | |||
0c74fb3343 | |||
d821a2efa6 | |||
66f2321d99 | |||
816f4f57fb | |||
9bdf3ec4c7 | |||
b9d4953bcd | |||
8c0fcdf5b7 | |||
a477cc00e7 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
.nogit/
|
||||
node_modules/
|
||||
test/
|
||||
pages/
|
||||
|
@ -7,15 +7,26 @@ cache:
|
||||
key: "$CI_BUILD_STAGE"
|
||||
|
||||
stages:
|
||||
- mirror
|
||||
- test
|
||||
- release
|
||||
- trigger
|
||||
- pages
|
||||
|
||||
mirror:
|
||||
image: hosttoday/ht-docker-node:npmci
|
||||
stage: mirror
|
||||
script:
|
||||
- npmci git mirror
|
||||
tags:
|
||||
- docker
|
||||
|
||||
testLEGACY:
|
||||
stage: test
|
||||
script:
|
||||
- npmci test legacy
|
||||
- npmci node install legacy
|
||||
- npmci npm install
|
||||
- npmci npm test
|
||||
coverage: /\d+.?\d+?\%\s*coverage/
|
||||
tags:
|
||||
- docker
|
||||
@ -24,7 +35,9 @@ testLEGACY:
|
||||
testLTS:
|
||||
stage: test
|
||||
script:
|
||||
- npmci test lts
|
||||
- npmci node install lts
|
||||
- npmci npm install
|
||||
- npmci npm test
|
||||
coverage: /\d+.?\d+?\%\s*coverage/
|
||||
tags:
|
||||
- docker
|
||||
@ -32,7 +45,9 @@ testLTS:
|
||||
testSTABLE:
|
||||
stage: test
|
||||
script:
|
||||
- npmci test stable
|
||||
- npmci node install stable
|
||||
- npmci npm install
|
||||
- npmci npm test
|
||||
coverage: /\d+.?\d+?\%\s*coverage/
|
||||
tags:
|
||||
- docker
|
||||
@ -40,7 +55,8 @@ testSTABLE:
|
||||
release:
|
||||
stage: release
|
||||
script:
|
||||
- npmci publish
|
||||
- npmci npm prepare
|
||||
- npmci npm publish
|
||||
only:
|
||||
- tags
|
||||
tags:
|
||||
|
10
dist/mod00/index.js → dist/mod_compile/index.js
vendored
10
dist/mod00/index.js → dist/mod_compile/index.js
vendored
@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
||||
* Note: Test files are only compiled in memory
|
||||
* -------------------------------------------- */
|
||||
const q = require("smartq");
|
||||
const plugins = require("./mod00.plugins");
|
||||
const NpmtsAssets = require("./mod00.assets");
|
||||
const NpmtsCheck = require("./mod00.check");
|
||||
const NpmtsClean = require("./mod00.clean");
|
||||
const NpmtsCompile = require("./mod00.compile");
|
||||
const plugins = require("./mod.plugins");
|
||||
const NpmtsAssets = require("./mod.assets");
|
||||
const NpmtsCheck = require("./mod.check");
|
||||
const NpmtsClean = require("./mod.clean");
|
||||
const NpmtsCompile = require("./mod.compile");
|
||||
exports.run = function (configArg) {
|
||||
let done = q.defer();
|
||||
plugins.beautylog.ora.text('starting TypeScript Compilation');
|
@ -2,14 +2,14 @@
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
const q = require("smartq");
|
||||
const paths = require("../npmts.paths");
|
||||
const plugins = require("./mod00.plugins");
|
||||
const mod00_check_1 = require("../mod00/mod00.check");
|
||||
const plugins = require("./mod.plugins");
|
||||
const mod_check_1 = require("../mod_compile/mod.check");
|
||||
exports.run = function (configArg) {
|
||||
let done = q.defer();
|
||||
let config = configArg;
|
||||
plugins.beautylog.ora.text('now looking at ' + 'required assets');
|
||||
if (config.cli === true) {
|
||||
let mainJsPath = mod00_check_1.projectInfo.packageJson.main;
|
||||
let mainJsPath = mod_check_1.projectInfo.packageJson.main;
|
||||
let cliJsString = plugins.smartfile.fs.toStringSync(plugins.path.join(paths.npmtsAssetsDir, 'cli.js'));
|
||||
cliJsString = cliJsString.replace('{{pathToIndex}}', mainJsPath);
|
||||
plugins.smartfile.memory.toFsSync(cliJsString, plugins.path.join(paths.distDir, 'cli.js'));
|
@ -11,7 +11,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
||||
const q = require("smartq");
|
||||
const projectinfo_1 = require("projectinfo");
|
||||
const paths = require("../npmts.paths");
|
||||
const plugins = require("./mod00.plugins");
|
||||
const plugins = require("./mod.plugins");
|
||||
let checkProjectTypings = (configArg) => {
|
||||
let done = q.defer();
|
||||
plugins.beautylog.ora.text('Check Module: Check Project Typings...');
|
||||
@ -20,7 +20,6 @@ let checkProjectTypings = (configArg) => {
|
||||
plugins.beautylog.error(`please add typings field to package.json`);
|
||||
process.exit(1);
|
||||
}
|
||||
;
|
||||
done.resolve(configArg);
|
||||
return done.promise;
|
||||
};
|
||||
@ -66,7 +65,6 @@ let checkDependencies = (configArg) => {
|
||||
for (let item in unused.invalidFiles) {
|
||||
plugins.beautylog.warn(`Watch out: could not parse file ${item}`);
|
||||
}
|
||||
;
|
||||
for (let item in unused.invalidDirs) {
|
||||
plugins.beautylog.warn(`Watch out: could not parse directory ${item}`);
|
||||
}
|
@ -2,7 +2,7 @@
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
const q = require("smartq");
|
||||
const paths = require("../npmts.paths");
|
||||
const plugins = require("./mod00.plugins");
|
||||
const plugins = require("./mod.plugins");
|
||||
/**
|
||||
* removes the dist directory which will be entirely rebuild
|
||||
*/
|
@ -2,7 +2,7 @@
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
const q = require("smartq");
|
||||
const paths = require("../npmts.paths");
|
||||
const plugins = require("./mod00.plugins");
|
||||
const plugins = require("./mod.plugins");
|
||||
exports.run = function (configArg) {
|
||||
let done = q.defer();
|
||||
let config = configArg;
|
25
dist/mod02/index.js → dist/mod_test/index.js
vendored
25
dist/mod02/index.js → dist/mod_test/index.js
vendored
@ -11,9 +11,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
||||
/* ------------------------------------------
|
||||
* This module tests the compiled TypeScript files
|
||||
* -------------------------------------------- */
|
||||
const plugins = require("./mod02.plugins");
|
||||
const plugins = require("./mod.plugins");
|
||||
const paths = require("../npmts.paths");
|
||||
const q = require("smartq");
|
||||
let testTypeScriptConfig = {
|
||||
target: 'ES5',
|
||||
emitDecoratorMetadata: true,
|
||||
experimentalDecorators: true,
|
||||
lib: [
|
||||
'DOM',
|
||||
'ESNext'
|
||||
]
|
||||
};
|
||||
/**
|
||||
* runs mocha
|
||||
* @returns INpmtsConfig
|
||||
@ -31,12 +40,7 @@ let tap = function (configArg) {
|
||||
let testableFilesSmartstream = new plugins.smartstream.Smartstream([
|
||||
plugins.smartgulp.src([plugins.path.join(paths.cwd, './ts/**/*.ts')]),
|
||||
plugins.gulpSourcemaps.init(),
|
||||
plugins.gulpTypeScript({
|
||||
target: 'ES5',
|
||||
emitDecoratorMetadata: true,
|
||||
experimentalDecorators: true,
|
||||
lib: ['DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable']
|
||||
}),
|
||||
plugins.gulpTypeScript(testTypeScriptConfig),
|
||||
plugins.gulpSourcemaps.write(),
|
||||
npmtsTapBuffer.pipeTestableFiles(),
|
||||
plugins.smartstream.cleanPipe()
|
||||
@ -47,12 +51,7 @@ let tap = function (configArg) {
|
||||
let testFilesSmartstream = new plugins.smartstream.Smartstream([
|
||||
plugins.smartgulp.src([plugins.path.join(paths.cwd, 'test/*.ts')]),
|
||||
plugins.gulpSourcemaps.init(),
|
||||
plugins.gulpTypeScript({
|
||||
target: 'ES5',
|
||||
emitDecoratorMetadata: true,
|
||||
experimentalDecorators: true,
|
||||
lib: ['DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable']
|
||||
}),
|
||||
plugins.gulpTypeScript(testTypeScriptConfig),
|
||||
plugins.gulpSourcemaps.write(),
|
||||
npmtsTapBuffer.pipeTestFiles(),
|
||||
plugins.smartstream.cleanPipe()
|
38
dist/npmts.cli.js
vendored
38
dist/npmts.cli.js
vendored
@ -23,11 +23,25 @@ const NpmtsShip = require("./npmts.ship");
|
||||
* Since yarn is out and there is heavy caching going on,
|
||||
* pure download stats are just not reliable enough for us anymore
|
||||
* Feel free to dig into the smartanalytics package, if you are interested in how it works.
|
||||
* It is just an https call to Google Analytics.
|
||||
* It is just an https call to our own Lossless Analytics API.
|
||||
* Our privacy policy can be found here: https://lossless.gmbh/privacy.html
|
||||
*/
|
||||
let npmtsAnalytics = new plugins.smartanalytics.AnalyticsAccount('npmts', 'UA-64087619-5');
|
||||
npmtsAnalytics.sendEvent('npm', 'exec', 'git.zone');
|
||||
let npmtsAnalytics = new plugins.smartanalytics.Analytics({
|
||||
apiEndPoint: 'https://pubapi.lossless.one/analytics',
|
||||
projectId: 'gitzone',
|
||||
appName: 'npmts'
|
||||
});
|
||||
process.nextTick(() => __awaiter(this, void 0, void 0, function* () {
|
||||
// make the analytics call
|
||||
npmtsAnalytics.recordEvent('npmToolExecution', {
|
||||
executionMode: (yield NpmtsConfig.configPromise).mode,
|
||||
tsOptions: (yield NpmtsConfig.configPromise).tsOptions,
|
||||
watch: (yield NpmtsConfig.configPromise).watch,
|
||||
coverageTreshold: (yield NpmtsConfig.configPromise).coverageTreshold
|
||||
}).catch(err => {
|
||||
plugins.beautylog.warn('Lossless Analytics API not available...');
|
||||
});
|
||||
}));
|
||||
exports.run = () => __awaiter(this, void 0, void 0, function* () {
|
||||
let done = q.defer();
|
||||
plugins.beautylog.figletSync('NPMTS');
|
||||
@ -44,15 +58,15 @@ exports.run = () => __awaiter(this, void 0, void 0, function* () {
|
||||
.then((configArg) => {
|
||||
let done = q.defer();
|
||||
plugins.beautylog.ora.start('loading additional modules...');
|
||||
NpmtsMods.mod00.load()
|
||||
.then((mod00) => {
|
||||
return mod00.run(configArg);
|
||||
NpmtsMods.modCompile.load()
|
||||
.then((modCompile) => {
|
||||
return modCompile.run(configArg);
|
||||
})
|
||||
.then(configArg => {
|
||||
let done = q.defer();
|
||||
NpmtsMods.mod01.load()
|
||||
.then(mod01 => {
|
||||
return mod01.run(configArg);
|
||||
NpmtsMods.modDocs.load()
|
||||
.then(modDocs => {
|
||||
return modDocs.run(configArg);
|
||||
})
|
||||
.then(configArg => {
|
||||
done.resolve(configArg);
|
||||
@ -61,9 +75,9 @@ exports.run = () => __awaiter(this, void 0, void 0, function* () {
|
||||
})
|
||||
.then(configArg => {
|
||||
let done = q.defer();
|
||||
NpmtsMods.mod02.load()
|
||||
.then(mod02 => {
|
||||
return mod02.run(configArg);
|
||||
NpmtsMods.modTest.load()
|
||||
.then(modTest => {
|
||||
return modTest.run(configArg);
|
||||
})
|
||||
.then(configArg => {
|
||||
done.resolve(configArg);
|
||||
|
1
dist/npmts.config.d.ts
vendored
1
dist/npmts.config.d.ts
vendored
@ -23,3 +23,4 @@ export interface INpmtsConfig {
|
||||
};
|
||||
}
|
||||
export declare let run: (argvArg: any) => Promise<{}>;
|
||||
export declare let configPromise: Promise<INpmtsConfig>;
|
||||
|
8
dist/npmts.config.js
vendored
8
dist/npmts.config.js
vendored
@ -2,9 +2,9 @@
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
const plugins = require("./npmts.plugins");
|
||||
const paths = require("./npmts.paths");
|
||||
const q = require("smartq");
|
||||
const smartq = require("smartq");
|
||||
exports.run = function (argvArg) {
|
||||
let done = q.defer();
|
||||
let done = smartq.defer();
|
||||
let defaultConfig = {
|
||||
argv: undefined,
|
||||
coverageTreshold: 70,
|
||||
@ -63,5 +63,9 @@ exports.run = function (argvArg) {
|
||||
}
|
||||
plugins.beautylog.ok('build options are ready!');
|
||||
done.resolve(config);
|
||||
configDeferred.resolve(config);
|
||||
return done.promise;
|
||||
};
|
||||
// config deferred usage
|
||||
let configDeferred = smartq.defer();
|
||||
exports.configPromise = configDeferred.promise;
|
||||
|
12
dist/npmts.mods.d.ts
vendored
12
dist/npmts.mods.d.ts
vendored
@ -1,7 +1,7 @@
|
||||
import { LazyModule } from 'smartsystem';
|
||||
import * as _mod00 from './mod00/index';
|
||||
import * as _mod01 from './mod01/index';
|
||||
import * as _mod02 from './mod02/index';
|
||||
export declare let mod00: LazyModule<typeof _mod00>;
|
||||
export declare let mod01: LazyModule<typeof _mod01>;
|
||||
export declare let mod02: LazyModule<typeof _mod02>;
|
||||
import * as _modCompile from './mod_compile/index';
|
||||
import * as _modDocs from './mod_docs/index';
|
||||
import * as _modTest from './mod_test/index';
|
||||
export declare let modCompile: LazyModule<typeof _modCompile>;
|
||||
export declare let modDocs: LazyModule<typeof _modDocs>;
|
||||
export declare let modTest: LazyModule<typeof _modTest>;
|
||||
|
6
dist/npmts.mods.js
vendored
6
dist/npmts.mods.js
vendored
@ -1,6 +1,6 @@
|
||||
"use strict";
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
const smartsystem_1 = require("smartsystem");
|
||||
exports.mod00 = new smartsystem_1.LazyModule('./mod00/index', __dirname);
|
||||
exports.mod01 = new smartsystem_1.LazyModule('./mod01/index', __dirname);
|
||||
exports.mod02 = new smartsystem_1.LazyModule('./mod02/index', __dirname);
|
||||
exports.modCompile = new smartsystem_1.LazyModule('./mod_compile/index', __dirname);
|
||||
exports.modDocs = new smartsystem_1.LazyModule('./mod_docs/index', __dirname);
|
||||
exports.modTest = new smartsystem_1.LazyModule('./mod_test/index', __dirname);
|
||||
|
26
docs/structure.md
Normal file
26
docs/structure.md
Normal file
@ -0,0 +1,26 @@
|
||||
---
|
||||
name: npmts project structure
|
||||
description: how npmts projects are structured
|
||||
---
|
||||
# npmts - Project Structure
|
||||
|
||||
**locally**
|
||||
|
||||
```text
|
||||
projectroot
|
||||
|- .nogit/ # contains files that should not be checked into git - NOgit
|
||||
|- dist/ # contains compiled js files and their corresponding typings - git
|
||||
|- node_modules/ # contains the installed node modules - NOgit
|
||||
|- test/ # contains the test files - git
|
||||
|- ts/ # contains the source TypeScript files - git
|
||||
|
|
||||
|- .gitignore # the normal gitignore file
|
||||
|- .gitlab-ci.yml # the gitlab ci yml file
|
||||
|- npmextra.json # npmextra.json
|
||||
|- package.json # the standard npm module package.json file
|
||||
|- readme.md # the standard project readme
|
||||
|- tslint.json # the standard tslint.json for TypeScript
|
||||
|- yarn.lock # yarn.lock - the standard yarn.lock file
|
||||
```
|
||||
|
||||
**in git**
|
27
package.json
27
package.json
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "npmts",
|
||||
"version": "8.0.12",
|
||||
"version": "8.0.26",
|
||||
"description": "best practice npm TypeScript modules",
|
||||
"main": "dist/index.js",
|
||||
"bin": {
|
||||
@ -34,36 +34,35 @@
|
||||
},
|
||||
"homepage": "https://gitlab.com/gitzone/npmts#readme",
|
||||
"dependencies": {
|
||||
"@types/gulp-sourcemaps": "0.0.31",
|
||||
"@types/minimatch": "^3.0.0",
|
||||
"@types/gulp-sourcemaps": "0.0.32",
|
||||
"@types/minimatch": "^3.0.1",
|
||||
"@types/through2": "^2.0.33",
|
||||
"beautylog": "^6.1.10",
|
||||
"depcheck": "^0.6.7",
|
||||
"depcheck": "^0.6.8",
|
||||
"early": "^2.1.1",
|
||||
"gulp-function": "^2.2.9",
|
||||
"gulp-sourcemaps": "^2.6.1",
|
||||
"gulp-typescript": "^3.2.1",
|
||||
"gulp-typescript": "^3.2.3",
|
||||
"lodash": "^4.17.4",
|
||||
"npmextra": "^2.0.9",
|
||||
"projectinfo": "^3.0.2",
|
||||
"smartanalytics": "^1.0.6",
|
||||
"projectinfo": "^3.0.4",
|
||||
"smartanalytics": "^2.0.9",
|
||||
"smartchok": "^1.0.11",
|
||||
"smartcli": "^2.0.7",
|
||||
"smartcli": "^2.0.9",
|
||||
"smartcov": "^1.0.2",
|
||||
"smarterror": "^1.0.3",
|
||||
"smartfile": "^4.2.20",
|
||||
"smartfile": "^4.2.26",
|
||||
"smartgulp": "^1.0.6",
|
||||
"smartpath": "^3.2.8",
|
||||
"smartq": "^1.1.6",
|
||||
"smartstream": "^1.0.10",
|
||||
"smartstring": "^2.0.24",
|
||||
"smartstring": "^2.0.28",
|
||||
"smartsystem": "^2.0.2",
|
||||
"smartupdate": "^1.0.7",
|
||||
"tapbuffer": "^1.0.29",
|
||||
"smartupdate": "^1.0.13",
|
||||
"tapbuffer": "^1.0.31",
|
||||
"through2": "^2.0.3",
|
||||
"tsn": "^2.0.15",
|
||||
"typescript": "^2.4.2",
|
||||
"typings-global": "^1.0.20"
|
||||
"typescript": "^2.6.2"
|
||||
},
|
||||
"devDependencies": {}
|
||||
}
|
||||
|
@ -1,27 +0,0 @@
|
||||
/* ------------------------------------------
|
||||
* This module compiles the module's TypeScript files
|
||||
* Note: Test files are only compiled in memory
|
||||
* -------------------------------------------- */
|
||||
import * as q from 'smartq'
|
||||
|
||||
import { INpmtsConfig } from '../npmts.config'
|
||||
|
||||
import * as plugins from './mod00.plugins'
|
||||
|
||||
import * as NpmtsAssets from './mod00.assets'
|
||||
import * as NpmtsCheck from './mod00.check'
|
||||
import * as NpmtsClean from './mod00.clean'
|
||||
import * as NpmtsCompile from './mod00.compile'
|
||||
|
||||
export let run = function(configArg: INpmtsConfig): Promise<INpmtsConfig> {
|
||||
let done = q.defer<INpmtsConfig>()
|
||||
plugins.beautylog.ora.text('starting TypeScript Compilation')
|
||||
NpmtsClean.run(configArg)
|
||||
.then(NpmtsCheck.run)
|
||||
.then(NpmtsCompile.run)
|
||||
.then(NpmtsAssets.run)
|
||||
.then(function(){
|
||||
done.resolve(configArg)
|
||||
})
|
||||
return done.promise
|
||||
}
|
@ -1,24 +0,0 @@
|
||||
import * as q from 'smartq'
|
||||
|
||||
import paths = require('../npmts.paths')
|
||||
|
||||
import plugins = require('./mod00.plugins')
|
||||
import { projectInfo } from '../mod00/mod00.check'
|
||||
|
||||
export let run = function(configArg){
|
||||
let done = q.defer()
|
||||
let config = configArg
|
||||
plugins.beautylog.ora.text('now looking at ' + 'required assets')
|
||||
if (config.cli === true) {
|
||||
let mainJsPath = projectInfo.packageJson.main
|
||||
let cliJsString: string = plugins.smartfile.fs.toStringSync(plugins.path.join(paths.npmtsAssetsDir,'cli.js'))
|
||||
cliJsString = cliJsString.replace('{{pathToIndex}}',mainJsPath)
|
||||
plugins.smartfile.memory.toFsSync(cliJsString, plugins.path.join(paths.distDir,'cli.js'))
|
||||
plugins.beautylog.ok('installed CLI assets!')
|
||||
done.resolve(config)
|
||||
} else {
|
||||
plugins.beautylog.ok('No additional assets required!')
|
||||
done.resolve(config)
|
||||
}
|
||||
return done.promise
|
||||
}
|
27
ts/mod_compile/index.ts
Normal file
27
ts/mod_compile/index.ts
Normal file
@ -0,0 +1,27 @@
|
||||
/* ------------------------------------------
|
||||
* This module compiles the module's TypeScript files
|
||||
* Note: Test files are only compiled in memory
|
||||
* -------------------------------------------- */
|
||||
import * as q from 'smartq'
|
||||
|
||||
import { INpmtsConfig } from '../npmts.config'
|
||||
|
||||
import * as plugins from './mod.plugins'
|
||||
|
||||
import * as NpmtsAssets from './mod.assets'
|
||||
import * as NpmtsCheck from './mod.check'
|
||||
import * as NpmtsClean from './mod.clean'
|
||||
import * as NpmtsCompile from './mod.compile'
|
||||
|
||||
export let run = function (configArg: INpmtsConfig): Promise<INpmtsConfig> {
|
||||
let done = q.defer<INpmtsConfig>()
|
||||
plugins.beautylog.ora.text('starting TypeScript Compilation')
|
||||
NpmtsClean.run(configArg)
|
||||
.then(NpmtsCheck.run)
|
||||
.then(NpmtsCompile.run)
|
||||
.then(NpmtsAssets.run)
|
||||
.then(function () {
|
||||
done.resolve(configArg)
|
||||
})
|
||||
return done.promise
|
||||
}
|
24
ts/mod_compile/mod.assets.ts
Normal file
24
ts/mod_compile/mod.assets.ts
Normal file
@ -0,0 +1,24 @@
|
||||
import * as q from 'smartq'
|
||||
|
||||
import paths = require('../npmts.paths')
|
||||
|
||||
import plugins = require('./mod.plugins')
|
||||
import { projectInfo } from '../mod_compile/mod.check'
|
||||
|
||||
export let run = function (configArg) {
|
||||
let done = q.defer()
|
||||
let config = configArg
|
||||
plugins.beautylog.ora.text('now looking at ' + 'required assets')
|
||||
if (config.cli === true) {
|
||||
let mainJsPath = projectInfo.packageJson.main
|
||||
let cliJsString: string = plugins.smartfile.fs.toStringSync(plugins.path.join(paths.npmtsAssetsDir, 'cli.js'))
|
||||
cliJsString = cliJsString.replace('{{pathToIndex}}', mainJsPath)
|
||||
plugins.smartfile.memory.toFsSync(cliJsString, plugins.path.join(paths.distDir, 'cli.js'))
|
||||
plugins.beautylog.ok('installed CLI assets!')
|
||||
done.resolve(config)
|
||||
} else {
|
||||
plugins.beautylog.ok('No additional assets required!')
|
||||
done.resolve(config)
|
||||
}
|
||||
return done.promise
|
||||
}
|
@ -6,7 +6,7 @@ import { INpmtsConfig } from '../npmts.config'
|
||||
|
||||
import * as paths from '../npmts.paths'
|
||||
|
||||
import * as plugins from './mod00.plugins'
|
||||
import * as plugins from './mod.plugins'
|
||||
|
||||
export let projectInfo: ProjectinfoNpm
|
||||
|
||||
@ -17,7 +17,7 @@ let checkProjectTypings = (configArg: INpmtsConfig) => {
|
||||
if (typeof projectInfo.packageJson.typings === 'undefined') {
|
||||
plugins.beautylog.error(`please add typings field to package.json`)
|
||||
process.exit(1)
|
||||
};
|
||||
}
|
||||
done.resolve(configArg)
|
||||
return done.promise
|
||||
}
|
||||
@ -64,7 +64,7 @@ let checkDependencies = (configArg: INpmtsConfig) => {
|
||||
}
|
||||
for (let item in unused.invalidFiles) {
|
||||
plugins.beautylog.warn(`Watch out: could not parse file ${item}`)
|
||||
};
|
||||
}
|
||||
for (let item in unused.invalidDirs) {
|
||||
plugins.beautylog.warn(`Watch out: could not parse directory ${item}`)
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
import * as q from 'smartq'
|
||||
import paths = require('../npmts.paths')
|
||||
|
||||
import plugins = require('./mod00.plugins')
|
||||
import plugins = require('./mod.plugins')
|
||||
|
||||
/**
|
||||
* removes the dist directory which will be entirely rebuild
|
@ -2,7 +2,7 @@ import * as q from 'smartq'
|
||||
|
||||
import * as paths from '../npmts.paths'
|
||||
|
||||
import * as plugins from './mod00.plugins'
|
||||
import * as plugins from './mod.plugins'
|
||||
|
||||
export let run = function (configArg) {
|
||||
let done = q.defer()
|
@ -6,10 +6,10 @@ import * as q from 'smartq'
|
||||
import * as paths from '../npmts.paths'
|
||||
import { INpmtsConfig } from '../npmts.config'
|
||||
|
||||
import * as plugins from './mod01.plugins'
|
||||
import * as plugins from './mod.plugins'
|
||||
|
||||
export let run = function (configArg: INpmtsConfig) {
|
||||
let done = q.defer<INpmtsConfig>()
|
||||
done.resolve(configArg)
|
||||
return done.promise
|
||||
let done = q.defer<INpmtsConfig>()
|
||||
done.resolve(configArg)
|
||||
return done.promise
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
/* ------------------------------------------
|
||||
* This module tests the compiled TypeScript files
|
||||
* -------------------------------------------- */
|
||||
import plugins = require('./mod02.plugins')
|
||||
import plugins = require('./mod.plugins')
|
||||
import paths = require('../npmts.paths')
|
||||
|
||||
import * as q from 'smartq'
|
||||
@ -10,6 +10,16 @@ import * as q from 'smartq'
|
||||
import { INpmtsConfig } from '../npmts.config'
|
||||
import { Smartfile } from 'smartfile'
|
||||
|
||||
let testTypeScriptConfig = {
|
||||
target: 'ES5',
|
||||
emitDecoratorMetadata: true,
|
||||
experimentalDecorators: true,
|
||||
lib: [
|
||||
'DOM',
|
||||
'ESNext'
|
||||
]
|
||||
}
|
||||
|
||||
/**
|
||||
* runs mocha
|
||||
* @returns INpmtsConfig
|
||||
@ -30,12 +40,7 @@ let tap = function (configArg: INpmtsConfig) {
|
||||
let testableFilesSmartstream = new plugins.smartstream.Smartstream([
|
||||
plugins.smartgulp.src([ plugins.path.join(paths.cwd, './ts/**/*.ts') ]),
|
||||
plugins.gulpSourcemaps.init(),
|
||||
plugins.gulpTypeScript({
|
||||
target: 'ES5',
|
||||
emitDecoratorMetadata: true,
|
||||
experimentalDecorators: true,
|
||||
lib: [ 'DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable' ]
|
||||
}),
|
||||
plugins.gulpTypeScript(testTypeScriptConfig),
|
||||
plugins.gulpSourcemaps.write(),
|
||||
npmtsTapBuffer.pipeTestableFiles(),
|
||||
plugins.smartstream.cleanPipe()
|
||||
@ -47,12 +52,7 @@ let tap = function (configArg: INpmtsConfig) {
|
||||
let testFilesSmartstream = new plugins.smartstream.Smartstream([
|
||||
plugins.smartgulp.src([ plugins.path.join(paths.cwd, 'test/*.ts') ]),
|
||||
plugins.gulpSourcemaps.init(),
|
||||
plugins.gulpTypeScript({
|
||||
target: 'ES5',
|
||||
emitDecoratorMetadata: true,
|
||||
experimentalDecorators: true,
|
||||
lib: [ 'DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable' ]
|
||||
}),
|
||||
plugins.gulpTypeScript(testTypeScriptConfig),
|
||||
plugins.gulpSourcemaps.write(),
|
||||
npmtsTapBuffer.pipeTestFiles(),
|
||||
plugins.smartstream.cleanPipe()
|
@ -15,14 +15,30 @@ import * as NpmtsShip from './npmts.ship'
|
||||
* Since yarn is out and there is heavy caching going on,
|
||||
* pure download stats are just not reliable enough for us anymore
|
||||
* Feel free to dig into the smartanalytics package, if you are interested in how it works.
|
||||
* It is just an https call to Google Analytics.
|
||||
* It is just an https call to our own Lossless Analytics API.
|
||||
* Our privacy policy can be found here: https://lossless.gmbh/privacy.html
|
||||
*/
|
||||
let npmtsAnalytics = new plugins.smartanalytics.AnalyticsAccount('npmts','UA-64087619-5')
|
||||
npmtsAnalytics.sendEvent('npm','exec','git.zone')
|
||||
let npmtsAnalytics = new plugins.smartanalytics.Analytics({
|
||||
apiEndPoint: 'https://pubapi.lossless.one/analytics',
|
||||
projectId: 'gitzone',
|
||||
appName: 'npmts'
|
||||
})
|
||||
|
||||
process.nextTick(async () => {
|
||||
// make the analytics call
|
||||
npmtsAnalytics.recordEvent('npmToolExecution', {
|
||||
executionMode: (await NpmtsConfig.configPromise).mode,
|
||||
tsOptions: (await NpmtsConfig.configPromise).tsOptions,
|
||||
watch: (await NpmtsConfig.configPromise).watch,
|
||||
coverageTreshold: (await NpmtsConfig.configPromise).coverageTreshold
|
||||
}).catch(err => {
|
||||
plugins.beautylog.warn('Lossless Analytics API not available...')
|
||||
})
|
||||
})
|
||||
|
||||
export let run = async () => {
|
||||
let done = q.defer()
|
||||
|
||||
plugins.beautylog.figletSync('NPMTS')
|
||||
let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot)
|
||||
// check for updates
|
||||
@ -37,15 +53,15 @@ export let run = async () => {
|
||||
.then((configArg: NpmtsConfig.INpmtsConfig) => {
|
||||
let done = q.defer()
|
||||
plugins.beautylog.ora.start('loading additional modules...')
|
||||
NpmtsMods.mod00.load()
|
||||
.then((mod00) => {
|
||||
return mod00.run(configArg)
|
||||
NpmtsMods.modCompile.load()
|
||||
.then((modCompile) => {
|
||||
return modCompile.run(configArg)
|
||||
})
|
||||
.then(configArg => {
|
||||
let done = q.defer<NpmtsConfig.INpmtsConfig>()
|
||||
NpmtsMods.mod01.load()
|
||||
.then(mod01 => {
|
||||
return mod01.run(configArg)
|
||||
NpmtsMods.modDocs.load()
|
||||
.then(modDocs => {
|
||||
return modDocs.run(configArg)
|
||||
})
|
||||
.then(configArg => {
|
||||
done.resolve(configArg)
|
||||
@ -54,9 +70,9 @@ export let run = async () => {
|
||||
})
|
||||
.then(configArg => {
|
||||
let done = q.defer<NpmtsConfig.INpmtsConfig>()
|
||||
NpmtsMods.mod02.load()
|
||||
.then(mod02 => {
|
||||
return mod02.run(configArg)
|
||||
NpmtsMods.modTest.load()
|
||||
.then(modTest => {
|
||||
return modTest.run(configArg)
|
||||
})
|
||||
.then(configArg => {
|
||||
done.resolve(configArg)
|
||||
|
@ -1,7 +1,7 @@
|
||||
import plugins = require('./npmts.plugins')
|
||||
import paths = require('./npmts.paths')
|
||||
|
||||
import * as q from 'smartq'
|
||||
import * as smartq from 'smartq'
|
||||
|
||||
// interfaces
|
||||
import { ITapbufferConfig } from 'tapbuffer'
|
||||
@ -32,7 +32,7 @@ export interface INpmtsConfig {
|
||||
}
|
||||
|
||||
export let run = function (argvArg) {
|
||||
let done = q.defer()
|
||||
let done = smartq.defer()
|
||||
let defaultConfig: INpmtsConfig = {
|
||||
argv: undefined,
|
||||
coverageTreshold: 70,
|
||||
@ -104,5 +104,10 @@ export let run = function (argvArg) {
|
||||
|
||||
plugins.beautylog.ok('build options are ready!')
|
||||
done.resolve(config)
|
||||
configDeferred.resolve(config)
|
||||
return done.promise
|
||||
}
|
||||
|
||||
// config deferred usage
|
||||
let configDeferred = smartq.defer<INpmtsConfig>()
|
||||
export let configPromise = configDeferred.promise
|
||||
|
@ -2,10 +2,10 @@ import * as plugins from './npmts.plugins'
|
||||
|
||||
import { LazyModule } from 'smartsystem'
|
||||
|
||||
import * as _mod00 from './mod00/index'
|
||||
import * as _mod01 from './mod01/index'
|
||||
import * as _mod02 from './mod02/index'
|
||||
import * as _modCompile from './mod_compile/index'
|
||||
import * as _modDocs from './mod_docs/index'
|
||||
import * as _modTest from './mod_test/index'
|
||||
|
||||
export let mod00 = new LazyModule<typeof _mod00>('./mod00/index',__dirname)
|
||||
export let mod01 = new LazyModule<typeof _mod01>('./mod01/index',__dirname)
|
||||
export let mod02 = new LazyModule<typeof _mod02>('./mod02/index',__dirname)
|
||||
export let modCompile = new LazyModule<typeof _modCompile>('./mod_compile/index',__dirname)
|
||||
export let modDocs = new LazyModule<typeof _modDocs>('./mod_docs/index',__dirname)
|
||||
export let modTest = new LazyModule<typeof _modTest>('./mod_test/index',__dirname)
|
||||
|
@ -8,27 +8,27 @@ import { INpmtsConfig } from './npmts.config'
|
||||
|
||||
let npmtsSmartchok: smartchok.Smartchok = null
|
||||
export let run = (configArg: INpmtsConfig) => {
|
||||
let done = q.defer()
|
||||
if (configArg.watch && npmtsSmartchok === null) {
|
||||
let pathsToWatch: string[] = []
|
||||
for (let key in configArg.ts) {
|
||||
pathsToWatch.push(key)
|
||||
}
|
||||
for (let key in configArg.testTs) {
|
||||
pathsToWatch.push(key)
|
||||
}
|
||||
npmtsSmartchok = new smartchok.Smartchok(pathsToWatch)
|
||||
npmtsSmartchok.getObservableFor('change').then((changeObservableArg) => {
|
||||
plugins.beautylog.info('now watching...')
|
||||
changeObservableArg.subscribe(() => {
|
||||
cli.run()
|
||||
})
|
||||
})
|
||||
npmtsSmartchok.start()
|
||||
done.resolve(configArg)
|
||||
} else {
|
||||
plugins.beautylog.info('not watching')
|
||||
done.resolve(configArg)
|
||||
let done = q.defer()
|
||||
if (configArg.watch && npmtsSmartchok === null) {
|
||||
let pathsToWatch: string[] = []
|
||||
for (let key in configArg.ts) {
|
||||
pathsToWatch.push(key)
|
||||
}
|
||||
return done.promise
|
||||
for (let key in configArg.testTs) {
|
||||
pathsToWatch.push(key)
|
||||
}
|
||||
npmtsSmartchok = new smartchok.Smartchok(pathsToWatch)
|
||||
npmtsSmartchok.getObservableFor('change').then((changeObservableArg) => {
|
||||
plugins.beautylog.info('now watching...')
|
||||
changeObservableArg.subscribe(() => {
|
||||
cli.run()
|
||||
})
|
||||
})
|
||||
npmtsSmartchok.start()
|
||||
done.resolve(configArg)
|
||||
} else {
|
||||
plugins.beautylog.info('not watching')
|
||||
done.resolve(configArg)
|
||||
}
|
||||
return done.promise
|
||||
}
|
||||
|
Reference in New Issue
Block a user