fix(core): update

This commit is contained in:
Philipp Kunz 2019-08-26 16:28:03 +02:00
parent dbcfa977fd
commit 6b1c7c4dc8
10 changed files with 103 additions and 68 deletions

23
.gitignore vendored
View File

@ -1,7 +1,22 @@
# gitzone standard .nogit/
node_modules/
# artifacts
coverage/ coverage/
pages/
public/ public/
assets/output/ pages/
# installs
node_modules/
# caches
.yarn/
.cache/
.rpt2_cache
# builds
dist/ dist/
dist_web/
dist_serve/
dist_ts_web/
# custom

View File

@ -1,5 +1,7 @@
# gitzone standard # gitzone ci_default
image: hosttoday/ht-docker-node:npmci image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
variables:
GIT_STRATEGY: clone
cache: cache:
paths: paths:
@ -38,19 +40,7 @@ snyk:
# test stage # test stage
# ==================== # ====================
testLTS: testStable:
stage: test
script:
- npmci npm prepare
- npmci node install lts
- npmci npm install
- npmci npm test
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- docker
- notpriv
testSTABLE:
stage: test stage: test
script: script:
- npmci npm prepare - npmci npm prepare
@ -60,12 +50,24 @@ testSTABLE:
coverage: /\d+.?\d+?\%\s*coverage/ coverage: /\d+.?\d+?\%\s*coverage/
tags: tags:
- docker - docker
- priv
testBuild:
stage: test
script:
- npmci npm prepare
- npmci node install lts
- npmci npm install
- npmci command npm run build
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- docker
- notpriv - notpriv
release: release:
stage: release stage: release
script: script:
- npmci node install stable - npmci node install lts
- npmci npm publish - npmci npm publish
only: only:
- tags - tags
@ -78,19 +80,11 @@ release:
# ==================== # ====================
codequality: codequality:
stage: metadata stage: metadata
image: docker:stable
allow_failure: true allow_failure: true
services:
- docker:stable-dind
script: script:
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - npmci command npm install -g tslint typescript
- docker run - npmci npm install
--env SOURCE_CODE="$PWD" - npmci command "tslint -c tslint.json ./ts/**/*.ts"
--volume "$PWD":/code
--volume /var/run/docker.sock:/var/run/docker.sock
"registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
artifacts:
paths: [codeclimate.json]
tags: tags:
- docker - docker
- priv - priv
@ -106,13 +100,15 @@ trigger:
- notpriv - notpriv
pages: pages:
image: hosttoday/ht-docker-node:npmci image: hosttoday/ht-docker-dbase:npmci
services:
- docker:18-dind
stage: metadata stage: metadata
script: script:
- npmci command npm install -g typedoc typescript - npmci command npm install -g @gitzone/tsdoc
- npmci npm prepare - npmci npm prepare
- npmci npm install - npmci npm install
- npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/ - npmci command tsdoc
tags: tags:
- docker - docker
- notpriv - notpriv

View File

@ -1,22 +1,20 @@
# tsn # @gitzone/tsbuild
TypeScript nightly to easily make use of latest features
## Availabililty ## Availabililty and Links
* [npmjs.org (npm package)](https://www.npmjs.com/package/@gitzone/tsbuild)
[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/tsn) * [gitlab.com (source)](https://gitlab.com/gitzone/tsbuild)
[![git](https://push.rocks/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/tsn) * [github.com (source mirror)](https://github.com/gitzone/tsbuild)
[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/tsn) * [docs (typedoc)](https://gitzone.gitlab.io/tsbuild/)
[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/tsn/)
## Status for master ## Status for master
[![build status](https://gitlab.com/gitzone/tsbuild/badges/master/build.svg)](https://gitlab.com/gitzone/tsbuild/commits/master)
[![build status](https://gitlab.com/pushrocks/tsn/badges/master/build.svg)](https://gitlab.com/pushrocks/tsn/commits/master) [![coverage report](https://gitlab.com/gitzone/tsbuild/badges/master/coverage.svg)](https://gitlab.com/gitzone/tsbuild/commits/master)
[![coverage report](https://gitlab.com/pushrocks/tsn/badges/master/coverage.svg)](https://gitlab.com/pushrocks/tsn/commits/master) [![npm downloads per month](https://img.shields.io/npm/dm/@gitzone/tsbuild.svg)](https://www.npmjs.com/package/@gitzone/tsbuild)
[![Dependency Status](https://david-dm.org/pushrocks/tsn.svg)](https://david-dm.org/pushrocks/tsn) [![Known Vulnerabilities](https://snyk.io/test/npm/@gitzone/tsbuild/badge.svg)](https://snyk.io/test/npm/@gitzone/tsbuild)
[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/tsn/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/tsn/master/dependencies/npm) [![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
[![bitHound Code](https://www.bithound.io/github/pushrocks/tsn/badges/code.svg)](https://www.bithound.io/github/pushrocks/tsn) [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/) [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
[![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/)
## Usage ## Usage
@ -68,3 +66,10 @@ tsn.compileGlobStringObject(
``` ```
[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks) [![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)
For further information read the linked docs at the top of this readme.
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

View File

@ -2,5 +2,15 @@
"npmci": { "npmci": {
"npmGlobalTools": [], "npmGlobalTools": [],
"npmAccessLevel": "public" "npmAccessLevel": "public"
},
"gitzone": {
"module": {
"githost": "gitlab.com",
"gitscope": "gitzone",
"gitrepo": "tsbuild",
"shortDescription": "TypeScript nightly to easily make use of latest features",
"npmPackagename": "@gitzone/tsbuild",
"license": "MIT"
}
} }
} }

View File

@ -40,5 +40,16 @@
"@types/node": "^12.7.2", "@types/node": "^12.7.2",
"tslint": "^5.19.0", "tslint": "^5.19.0",
"tslint-config-prettier": "^1.18.0" "tslint-config-prettier": "^1.18.0"
} },
"files": [
"ts/*",
"ts_web/*",
"dist/*",
"dist_web/*",
"dist_ts_web/*",
"assets/*",
"cli.js",
"npmextra.json",
"readme.md"
]
} }

View File

@ -28,7 +28,10 @@ export const compilerOptionsWebDefault: CompilerOptions = {
/** /**
* merges compilerOptions with the default compiler options * merges compilerOptions with the default compiler options
*/ */
export const mergeCompilerOptions = (customTsOptions: CompilerOptions, argvArg?: any): CompilerOptions => { export const mergeCompilerOptions = (
customTsOptions: CompilerOptions,
argvArg?: any
): CompilerOptions => {
const defaultOptionsToMerge = (() => { const defaultOptionsToMerge = (() => {
if (argvArg && argvArg.web) { if (argvArg && argvArg.web) {
return compilerOptionsWebDefault; return compilerOptionsWebDefault;
@ -52,7 +55,7 @@ export const mergeCompilerOptions = (customTsOptions: CompilerOptions, argvArg?:
export const compiler = ( export const compiler = (
fileNames: string[], fileNames: string[],
options: plugins.typescript.CompilerOptions, options: plugins.typescript.CompilerOptions,
argvArg?: any, argvArg?: any
): Promise<any[]> => { ): Promise<any[]> => {
console.log(`Compiling ${fileNames.length} files...`); console.log(`Compiling ${fileNames.length} files...`);
let done = plugins.smartpromise.defer<any[]>(); let done = plugins.smartpromise.defer<any[]>();

View File

@ -25,16 +25,11 @@ tsbuildCli.standardTask().subscribe(argvArg => {
tsbuildCli.addCommand('custom').subscribe(argvArg => { tsbuildCli.addCommand('custom').subscribe(argvArg => {
const listedDirectories = argvArg._; const listedDirectories = argvArg._;
listedDirectories.shift(); listedDirectories.shift();
const compilationCommandObject: {[key: string]: string} = {}; const compilationCommandObject: { [key: string]: string } = {};
for (const directory of listedDirectories) { for (const directory of listedDirectories) {
compilationCommandObject[`./${directory}/**/*.ts`] = `./dist_${directory}`; compilationCommandObject[`./${directory}/**/*.ts`] = `./dist_${directory}`;
}; }
tsbuild.compileGlobStringObject( tsbuild.compileGlobStringObject(compilationCommandObject, {}, process.cwd(), argvArg);
compilationCommandObject,
{},
process.cwd(),
argvArg
);
}); });
tsbuildCli.startParse(); tsbuildCli.startParse();

View File

@ -9,7 +9,7 @@ export * from './tsbuild.classes.compiler';
export let compileFileArray = ( export let compileFileArray = (
fileStringArrayArg: string[], fileStringArrayArg: string[],
compilerOptionsArg: CompilerOptions = {}, compilerOptionsArg: CompilerOptions = {},
argvArg?: any, argvArg?: any
): Promise<any[]> => { ): Promise<any[]> => {
return compiler(fileStringArrayArg, mergeCompilerOptions(compilerOptionsArg, argvArg), argvArg); return compiler(fileStringArrayArg, mergeCompilerOptions(compilerOptionsArg, argvArg), argvArg);
}; };
@ -25,11 +25,11 @@ export let compileGlobStringObject = async (
globStringObjectArg: any, globStringObjectArg: any,
tsOptionsArg: CompilerOptions = {}, tsOptionsArg: CompilerOptions = {},
cwdArg: string = process.cwd(), cwdArg: string = process.cwd(),
argvArg?: any, argvArg?: any
) => { ) => {
let compiledFiles = []; let compiledFiles = [];
for (const keyArg in globStringObjectArg) { for (const keyArg in globStringObjectArg) {
if(globStringObjectArg[keyArg]) { if (globStringObjectArg[keyArg]) {
console.log( console.log(
`TypeScript assignment: transpile from ${keyArg} to ${globStringObjectArg[keyArg]}` `TypeScript assignment: transpile from ${keyArg} to ${globStringObjectArg[keyArg]}`
); );