From a34d98b8408ffb6cf31a546fa4da9498a007676a Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Fri, 13 Mar 2020 17:48:19 +0000 Subject: [PATCH] fix(core): update --- .gitlab-ci.yml | 84 +++++++++++++++++++---------------- .vscode/launch.json | 29 ++++++++++++ .vscode/settings.json | 26 +++++++++++ npmextra.json | 1 + package.json | 2 +- readme.md | 7 ++- ts/tswatch.classes.tswatch.ts | 21 ++++----- ts/tswatch.classes.watcher.ts | 2 +- ts/tswatch.plugins.ts | 17 ++++--- 9 files changed, 132 insertions(+), 57 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b92fd3..a95dfb6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,14 +3,14 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci cache: paths: - - .npmci_cache/ - key: "$CI_BUILD_STAGE" + - .npmci_cache/ + key: '$CI_BUILD_STAGE' stages: -- security -- test -- release -- metadata + - security + - test + - release + - metadata # ==================== # security stage @@ -18,21 +18,23 @@ stages: mirror: stage: security script: - - npmci git mirror + - npmci git mirror tags: - - docker - - notpriv + - lossless + - docker + - notpriv snyk: + image: registry.gitlab.com/hosttoday/ht-docker-node:snyk stage: security script: - npmci npm prepare - - npmci command npm install -g snyk - npmci command npm install --ignore-scripts - npmci command snyk test tags: - - docker - - notpriv + - lossless + - docker + - notpriv # ==================== # test stage @@ -41,37 +43,40 @@ snyk: testStable: stage: test script: - - npmci npm prepare - - npmci node install stable - - npmci npm install - - npmci npm test + - npmci npm prepare + - npmci node install stable + - npmci npm install + - npmci npm test coverage: /\d+.?\d+?\%\s*coverage/ tags: - - docker - - priv + - lossless + - docker + - priv testBuild: stage: test script: - - npmci npm prepare - - npmci node install stable - - npmci npm install - - npmci command npm run build + - npmci npm prepare + - npmci node install stable + - npmci npm install + - npmci command npm run build coverage: /\d+.?\d+?\%\s*coverage/ tags: - - docker - - notpriv + - lossless + - docker + - notpriv release: stage: release script: - - npmci node install stable - - npmci npm publish + - npmci node install stable + - npmci npm publish only: - - tags + - tags tags: - - docker - - notpriv + - lossless + - docker + - notpriv # ==================== # metadata stage @@ -85,30 +90,31 @@ codequality: - npmci npm install - npmci command "tslint -c tslint.json ./ts/**/*.ts" tags: - - docker - - priv + - lossless + - docker + - priv trigger: stage: metadata script: - - npmci trigger + - npmci trigger only: - - tags + - tags tags: - - docker - - notpriv + - lossless + - docker + - notpriv pages: - image: hosttoday/ht-docker-dbase:npmci - services: - - docker:stable-dind stage: metadata script: + - npmci node install lts - npmci command npm install -g @gitzone/tsdoc - npmci npm prepare - npmci npm install - npmci command tsdoc tags: + - lossless - docker - notpriv only: @@ -116,5 +122,5 @@ pages: artifacts: expire_in: 1 week paths: - - public + - public allow_failure: true diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..112db52 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,29 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "current file", + "type": "node", + "request": "launch", + "args": [ + "${relativeFile}" + ], + "runtimeArgs": ["-r", "@gitzone/tsrun"], + "cwd": "${workspaceRoot}", + "protocol": "inspector", + "internalConsoleOptions": "openOnSessionStart" + }, + { + "name": "test.ts", + "type": "node", + "request": "launch", + "args": [ + "test/test.ts" + ], + "runtimeArgs": ["-r", "@gitzone/tsrun"], + "cwd": "${workspaceRoot}", + "protocol": "inspector", + "internalConsoleOptions": "openOnSessionStart" + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..01d2b8d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,26 @@ +{ + "json.schemas": [ + { + "fileMatch": ["/npmextra.json"], + "schema": { + "type": "object", + "properties": { + "npmci": { + "type": "object", + "description": "settings for npmci" + }, + "gitzone": { + "type": "object", + "description": "settings for gitzone", + "properties": { + "projectType": { + "type": "string", + "enum": ["website", "element", "service", "npm"] + } + } + } + } + } + } + ] +} diff --git a/npmextra.json b/npmextra.json index 10c090b..0e38baa 100644 --- a/npmextra.json +++ b/npmextra.json @@ -4,6 +4,7 @@ "npmAccessLevel": "public" }, "gitzone": { + "projectType": "npm", "module": { "githost": "gitlab.com", "gitscope": "gitzone", diff --git a/package.json b/package.json index 4886cd3..86d1271 100644 --- a/package.json +++ b/package.json @@ -48,4 +48,4 @@ "npmextra.json", "readme.md" ] -} +} \ No newline at end of file diff --git a/readme.md b/readme.md index 841004b..32279b4 100644 --- a/readme.md +++ b/readme.md @@ -8,7 +8,7 @@ watch typescript projects during development * [docs (typedoc)](https://gitzone.gitlab.io/tswatch/) ## Status for master -[![build status](https://gitlab.com/gitzone/tswatch/badges/master/build.svg)](https://gitlab.com/gitzone/tswatch/commits/master) +[![pipeline status](https://gitlab.com/gitzone/tswatch/badges/master/pipeline.svg)](https://gitlab.com/gitzone/tswatch/commits/master) [![coverage report](https://gitlab.com/gitzone/tswatch/badges/master/coverage.svg)](https://gitlab.com/gitzone/tswatch/commits/master) [![npm downloads per month](https://img.shields.io/npm/dm/@gitzone/tswatch.svg)](https://www.npmjs.com/package/@gitzone/tswatch) [![Known Vulnerabilities](https://snyk.io/test/npm/@gitzone/tswatch/badge.svg)](https://snyk.io/test/npm/@gitzone/tswatch) @@ -18,6 +18,11 @@ watch typescript projects during development ## Usage + +## Contribution + +We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :) + For further information read the linked docs at the top of this readme. > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh) diff --git a/ts/tswatch.classes.tswatch.ts b/ts/tswatch.classes.tswatch.ts index 5ff93ed..fe1ac23 100644 --- a/ts/tswatch.classes.tswatch.ts +++ b/ts/tswatch.classes.tswatch.ts @@ -39,7 +39,9 @@ export class TsWatch { break; case 'gitzone_element': // lets create a standard server - console.log('bundling TypeScript files to "dist_watch" Note: This is for development only!'); + console.log( + 'bundling TypeScript files to "dist_watch" Note: This is for development only!' + ); this.smartserve = new plugins.smartserve.SmartServe({ port: 3001, injectReload: true, @@ -67,14 +69,14 @@ export class TsWatch { ); break; case 'gitzone_service': - this.watcherMap.add( - new Watcher({ - filePathToWatch: plugins.path.join(paths.cwd, './ts/'), - commandToExecute: 'npm run startTs', - timeout: null - }) - ); - break; + this.watcherMap.add( + new Watcher({ + filePathToWatch: plugins.path.join(paths.cwd, './ts/'), + commandToExecute: 'npm run startTs', + timeout: null + }) + ); + break; case 'echoSomething': const tsWatchInstanceEchoSomething = new Watcher({ filePathToWatch: plugins.path.join(paths.cwd, './ts'), @@ -90,7 +92,6 @@ export class TsWatch { await watcher.start(); }); if (this.smartserve) { - await this.smartserve.start(); } } diff --git a/ts/tswatch.classes.watcher.ts b/ts/tswatch.classes.watcher.ts index a64d8fa..2016301 100644 --- a/ts/tswatch.classes.watcher.ts +++ b/ts/tswatch.classes.watcher.ts @@ -21,7 +21,7 @@ export class Watcher { }); /** - * used to execute + * used to execute */ private executionTask: plugins.taskbuffer.Task = new plugins.taskbuffer.Task({ name: 'watcherCommandFunctionTask', diff --git a/ts/tswatch.plugins.ts b/ts/tswatch.plugins.ts index 7263cda..4ddf104 100644 --- a/ts/tswatch.plugins.ts +++ b/ts/tswatch.plugins.ts @@ -12,12 +12,19 @@ import * as smartserve from '@pushrocks/smartserve'; import * as smartshell from '@pushrocks/smartshell'; import * as taskbuffer from '@pushrocks/taskbuffer'; -export { lik, smartchok, smartcli, smartdelay, smartlog, smartlogDestinationLocal, smartserve, smartshell, taskbuffer }; - +export { + lik, + smartchok, + smartcli, + smartdelay, + smartlog, + smartlogDestinationLocal, + smartserve, + smartshell, + taskbuffer +}; // third party scope import parcel from 'parcel-bundler'; -export { - parcel -}; +export { parcel };