1.0.48

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/
 
 # custom

.gitlab-ci.yml

@@ -24,6 +24,19 @@ mirror:
     - docker
     - notpriv
 
+audit:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high
+  tags:
+    - lossless
+    - docker
+    - notpriv
+
 # ====================
 # test stage
 # ====================

.snyk

@@ -1,54 +0,0 @@
-# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.13.5
-# ignores vulnerabilities until expiry date; change duration by modifying expiry date
-ignore:
-  SNYK-JS-MINIMIST-559764:
-    - parcel-bundler > @babel/core > json5 > minimist:
-        reason: None given
-        expires: '2020-04-12T17:46:49.672Z'
-    - parcel-bundler > mkdirp > minimist:
-        reason: None given
-        expires: '2020-04-12T17:46:49.672Z'
-    - parcel-bundler > @parcel/fs > mkdirp > minimist:
-        reason: None given
-        expires: '2020-04-12T17:46:49.672Z'
-    - parcel-bundler > htmlnano > svgo > mkdirp > minimist:
-        reason: None given
-        expires: '2020-04-12T17:46:49.672Z'
-    - parcel-bundler > cssnano > cssnano-preset-default > postcss-svgo > svgo > mkdirp > minimist:
-        reason: None given
-        expires: '2020-04-12T17:46:49.672Z'
-    - parcel-bundler > htmlnano > cssnano > cssnano-preset-default > postcss-svgo > svgo > mkdirp > minimist:
-        reason: None given
-        expires: '2020-04-12T17:46:49.672Z'
-    - parcel-bundler > mkdirp > minimist:
-        reason: None given
-        expires: '2020-04-12T18:01:44.139Z'
-    - parcel-bundler > @parcel/fs > mkdirp > minimist:
-        reason: None given
-        expires: '2020-04-12T18:01:44.139Z'
-    - parcel-bundler > htmlnano > svgo > mkdirp > minimist:
-        reason: None given
-        expires: '2020-04-12T18:01:44.139Z'
-    - parcel-bundler > cssnano > cssnano-preset-default > postcss-svgo > svgo > mkdirp > minimist:
-        reason: None given
-        expires: '2020-04-12T18:01:44.139Z'
-    - parcel-bundler > htmlnano > cssnano > cssnano-preset-default > postcss-svgo > svgo > mkdirp > minimist:
-        reason: None given
-        expires: '2020-04-12T18:01:44.139Z'
-    - parcel-bundler > mkdirp > minimist:
-        reason: None given
-        expires: '2020-04-12T18:07:10.923Z'
-    - parcel-bundler > @parcel/fs > mkdirp > minimist:
-        reason: None given
-        expires: '2020-04-12T18:07:10.923Z'
-    - parcel-bundler > htmlnano > svgo > mkdirp > minimist:
-        reason: None given
-        expires: '2020-04-12T18:07:10.923Z'
-    - parcel-bundler > cssnano > cssnano-preset-default > postcss-svgo > svgo > mkdirp > minimist:
-        reason: None given
-        expires: '2020-04-12T18:07:10.923Z'
-    - parcel-bundler > htmlnano > cssnano > cssnano-preset-default > postcss-svgo > svgo > mkdirp > minimist:
-        reason: None given
-        expires: '2020-04-12T18:07:10.923Z'
-patch: {}

cli.js

@@ -1,3 +1,4 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
-require('./dist/index');
+const cliTool = require('./dist_ts/index');
+cliTool.runCli();

cli.ts.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
 require('@gitzone/tsrun');
-require('./ts/index');
+const cliTool = require('./ts/index');
+cliTool.runCli();

package.json

@@ -1,37 +1,37 @@
 {
   "name": "@gitzone/tswatch",
-  "version": "1.0.43",
+  "version": "1.0.48",
   "private": false,
   "description": "watch typescript projects during development",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
   "bin": {
     "tswatch": "cli.js"
   },
   "scripts": {
-    "test": "(tstest test/)",
-    "build": "(tsbuild)"
+    "test": "(tstest test/ --web)",
+    "build": "(tsbuild --web)"
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.24",
-    "@gitzone/tstest": "^1.0.28",
+    "@gitzone/tstest": "^1.0.33",
     "@pushrocks/tapbundle": "^3.2.1",
-    "@types/node": "^14.0.5",
+    "@types/node": "^14.0.14",
     "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@gitzone/tsrun": "^1.2.8",
+    "@gitzone/tsrun": "^1.2.12",
     "@pushrocks/early": "^3.0.3",
-    "@pushrocks/lik": "^4.0.0",
+    "@pushrocks/lik": "^4.0.13",
     "@pushrocks/smartchok": "^1.0.23",
-    "@pushrocks/smartcli": "^3.0.11",
-    "@pushrocks/smartdelay": "^2.0.6",
-    "@pushrocks/smartlog": "^2.0.21",
-    "@pushrocks/smartlog-destination-local": "^8.0.2",
-    "@pushrocks/smartserve": "^1.1.39",
+    "@pushrocks/smartcli": "^3.0.12",
+    "@pushrocks/smartdelay": "^2.0.9",
+    "@pushrocks/smartlog": "^2.0.35",
+    "@pushrocks/smartlog-destination-local": "^8.0.8",
+    "@pushrocks/smartserve": "^1.1.41",
     "@pushrocks/smartshell": "^2.0.26",
     "@pushrocks/taskbuffer": "^2.1.1",
     "@types/parcel-bundler": "^1.12.1",
@@ -41,7 +41,8 @@
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",

readme.md

@@ -8,16 +8,24 @@ watch typescript projects during development
 * [docs (typedoc)](https://gitzone.gitlab.io/tswatch/)
 
 ## Status for 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)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/gitzone/tswatch/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/gitzone/tswatch/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@gitzone/tswatch)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/gitzone/tswatch)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@gitzone/tswatch)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@gitzone/tswatch)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@gitzone/tswatch)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
+Use TypeScript for best in class intellisense
 
 ## Contribution
 

test/test.ts

@@ -12,7 +12,7 @@ tap.test('should start the tswatch instance', async () => {
   await testTsWatchInstance.start();
 });
 
-tap.test('should stop the instance', async tools => {
+tap.test('should stop the instance', async (tools) => {
   tools.delayFor(2000);
   testTsWatchInstance.stop();
 });

ts/index.ts

@@ -1,5 +1,5 @@
 import * as early from '@pushrocks/early';
 early.start('tswatch');
 export * from './tswatch.classes.tswatch';
-import './tswatch.cli';
+export * from './tswatch.cli';
 early.stop();

ts/tswatch.classes.parcel.ts

@@ -2,12 +2,8 @@ import * as plugins from './tswatch.plugins';
 import * as paths from './tswatch.paths';
 
 export class Parcel {
-  public async start() {
-    const entryFiles = plugins.path.join(paths.cwd, './html/index.html');
-
-    // Bundler options
-    const options: plugins.parcel.ParcelOptions = {
-      outDir: './dist_watch', // The out directory to put the build files in, defaults to dist
+  private defaultOptions: plugins.parcel.ParcelOptions = {
+    outDir: plugins.path.join(process.cwd(), './dist_watch'), // The out directory to put the build files in, defaults to dist
     outFile: 'index.html', // The name of the outputFile
     publicUrl: '/', // The url to serve on, defaults to '/'
     watch: true, // Whether to watch the files and rebuild them on change, defaults to process.env.NODE_ENV !== 'production'
@@ -25,13 +21,25 @@ export class Parcel {
     hmrPort: 3003, // The port the HMR socket runs on, defaults to a random free port (0 in node.js resolves to a random free port)
     sourceMaps: true, // Enable or disable sourcemaps, defaults to enabled (minified builds currently always create sourcemaps)
     hmrHostname: '', // A hostname for hot module reload, default to ''
-      detailedReport: false // Prints a detailed report of the bundles, assets, filesizes and times, defaults to false, reports are only printed if watch is disabled
+    detailedReport: false, // Prints a detailed report of the bundles, assets, filesizes and times, defaults to false, reports are only printed if watch is disabled
   };
+  public options: plugins.parcel.ParcelOptions;
+  public entryFiles: string | string[] = plugins.path.join(paths.cwd, './html/index.html');
 
-    const bundler = new plugins.parcel(entryFiles, options);
+  public async start() {
+    const bundler = new plugins.parcel(this.entryFiles, this.options);
 
     // Run the bundler, this returns the main bundle
     // Use the events if you're using watch mode as this promise will only trigger once and not for every rebuild
     const bundle = await bundler.serve(3002);
   }
+
+  constructor(fromArg: string | string[], outputDirArg: string, outputFileArg: string) {
+    this.entryFiles = fromArg;
+    this.options = {
+      ...this.defaultOptions,
+      outDir: outputDirArg,
+      outFile: outputFileArg,
+    };
+  }
 }

ts/tswatch.classes.tswatch.ts

@@ -24,7 +24,7 @@ export class TsWatch {
           new Watcher({
             filePathToWatch: paths.cwd,
             commandToExecute: 'npm run test2',
-            timeout: null
+            timeout: null,
           })
         );
         break;
@@ -33,7 +33,7 @@ export class TsWatch {
           new Watcher({
             filePathToWatch: paths.cwd,
             commandToExecute: 'npm run test',
-            timeout: null
+            timeout: null,
           })
         );
         break;
@@ -42,7 +42,11 @@ export class TsWatch {
         console.log(
           'bundling TypeScript files to "dist_watch" Note: This is for development only!'
         );
-        const parcel = new Parcel();
+        const parcel = new Parcel(
+          plugins.path.join(process.cwd(), './html/index.html'),
+          plugins.path.join(process.cwd(), './dist_watch'),
+          'index.html'
+        );
         await parcel.start();
         break;
       case 'gitzone_website':
@@ -50,25 +54,23 @@ export class TsWatch {
           new Watcher({
             filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
             commandToExecute: 'npm run startTs',
-            timeout: null
+            timeout: null,
           })
         );
 
         // client directory
-        this.watcherMap.add(
-          new Watcher({
-            filePathToWatch: plugins.path.join(paths.cwd, './ts_web/'),
-            commandToExecute: 'npm run build',
-            timeout: null
-          })
+        const parcelWebsite = new Parcel(
+          plugins.path.join(process.cwd(), './ts_web/index.ts'),
+          plugins.path.join(process.cwd(), './dist_serve'),
+          'bundle.js'
         );
-        break;
+        await parcelWebsite.start();
       case 'gitzone_service':
         this.watcherMap.add(
           new Watcher({
             filePathToWatch: plugins.path.join(paths.cwd, './ts/'),
             commandToExecute: 'npm run startTs',
-            timeout: null
+            timeout: null,
           })
         );
         break;
@@ -76,14 +78,14 @@ export class TsWatch {
         const tsWatchInstanceEchoSomething = new Watcher({
           filePathToWatch: plugins.path.join(paths.cwd, './ts'),
           commandToExecute: 'npm -v',
-          timeout: null
+          timeout: null,
         });
         this.watcherMap.add(tsWatchInstanceEchoSomething);
         break;
       default:
         break;
     }
-    this.watcherMap.forEach(async watcher => {
+    this.watcherMap.forEach(async (watcher) => {
       await watcher.start();
     });
     if (this.smartserve) {
@@ -98,7 +100,7 @@ export class TsWatch {
     if (this.smartserve) {
       await this.smartserve.stop();
     }
-    this.watcherMap.forEach(async watcher => {
+    this.watcherMap.forEach(async (watcher) => {
       await watcher.stop();
     });
   }

ts/tswatch.classes.watcher.ts

@@ -17,7 +17,7 @@ export class Watcher {
    * used to execute shell commands
    */
   private smartshellInstance = new plugins.smartshell.Smartshell({
-    executor: 'bash'
+    executor: 'bash',
   });
 
   private currentExecution: plugins.smartshell.IExecResultStreaming;

ts/tswatch.cli.ts

@@ -8,34 +8,36 @@ const tswatchCli = new plugins.smartcli.Smartcli();
 
 // standard behaviour will assume gitzone setup
 
-tswatchCli.addCommand('element').subscribe(async argvArg => {
+tswatchCli.addCommand('element').subscribe(async (argvArg) => {
   logger.log('info', `running watch task for a gitzone element project`);
   const tsWatch = new TsWatch('gitzone_element');
   await tsWatch.start();
 });
 
-tswatchCli.addCommand('npm').subscribe(async argvArg => {
+tswatchCli.addCommand('npm').subscribe(async (argvArg) => {
   logger.log('info', `running watch task for a gitzone element project`);
   const tsWatch = new TsWatch('gitzone_npm');
   await tsWatch.start();
 });
 
-tswatchCli.addCommand('service').subscribe(async argvArg => {
+tswatchCli.addCommand('service').subscribe(async (argvArg) => {
   logger.log('info', `running test task`);
   const tsWatch = new TsWatch('gitzone_service');
   await tsWatch.start();
 });
 
-tswatchCli.addCommand('test').subscribe(async argvArg => {
+tswatchCli.addCommand('test').subscribe(async (argvArg) => {
   logger.log('info', `running test task`);
   const tsWatch = new TsWatch('test');
   await tsWatch.start();
 });
 
-tswatchCli.addCommand('website').subscribe(async argvArg => {
+tswatchCli.addCommand('website').subscribe(async (argvArg) => {
   logger.log('info', `running watch task for a gitzone website project`);
   const tsWatch = new TsWatch('gitzone_website');
   await tsWatch.start();
 });
 
+export const runCli = async () => {
   tswatchCli.startParse();
+};

ts/tswatch.logging.ts

@@ -7,9 +7,9 @@ export const logger = new plugins.smartlog.Smartlog({
     containerName: 'Some Containername',
     environment: 'local',
     runtime: 'node',
-    zone: 'gitzone'
+    zone: 'gitzone',
   },
-  minimumLogLevel: 'silly'
+  minimumLogLevel: 'silly',
 });
 
 logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());

ts/tswatch.plugins.ts

@@ -21,7 +21,7 @@ export {
   smartlogDestinationLocal,
   smartserve,
   smartshell,
-  taskbuffer
+  taskbuffer,
 };
 
 // third party scope