1.0.42

.gitlab-ci.yml

@@ -24,18 +24,6 @@ mirror:
     - docker
     - notpriv
 
-snyk:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
-  stage: security
-  script:
-    - npmci npm prepare
-    - npmci command npm install --ignore-scripts
-    - npmci command snyk test
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
 # ====================
 # test stage
 # ====================

.snyk

@@ -21,4 +21,34 @@ ignore:
     - 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: {}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tswatch",
-  "version": "1.0.36",
+  "version": "1.0.42",
   "private": false,
   "description": "watch typescript projects during development",
   "main": "dist/index.js",
@@ -15,24 +15,24 @@
     "build": "(tsbuild)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsbuild": "^2.1.24",
     "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.2.0",
+    "@pushrocks/tapbundle": "^3.2.1",
-    "@types/node": "^13.9.0",
+    "@types/node": "^14.0.5",
-    "tslint": "^6.0.0",
+    "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
     "@gitzone/tsrun": "^1.2.8",
     "@pushrocks/early": "^3.0.3",
-    "@pushrocks/lik": "^3.0.19",
+    "@pushrocks/lik": "^4.0.0",
     "@pushrocks/smartchok": "^1.0.23",
-    "@pushrocks/smartcli": "^3.0.7",
+    "@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/smartshell": "^2.0.25",
+    "@pushrocks/smartshell": "^2.0.26",
     "@pushrocks/taskbuffer": "^2.1.1",
     "@types/parcel-bundler": "^1.12.1",
     "parcel-bundler": "^1.12.4"

ts/tswatch.classes.tswatch.ts

@@ -42,11 +42,6 @@ export class TsWatch {
         console.log(
           'bundling TypeScript files to "dist_watch" Note: This is for development only!'
         );
-        this.smartserve = new plugins.smartserve.SmartServe({
-          port: 3001,
-          injectReload: true,
-          serveDir: plugins.path.join(paths.cwd, './dist_watch/')
-        });
         const parcel = new Parcel();
         await parcel.start();
         break;

ts/tswatch.classes.watcher.ts

@@ -20,21 +20,6 @@ export class Watcher {
     executor: 'bash'
   });
 
-  /**
-   * used to execute
-   */
-  private executionTask: plugins.taskbuffer.Task = new plugins.taskbuffer.Task({
-    name: 'watcherCommandFunctionTask',
-    taskFunction: async () => {
-      if (typeof this.options.commandToExecute === 'string') {
-        throw new Error('cannot execute string as task');
-      }
-      await this.options.commandToExecute();
-    },
-    buffered: true,
-    bufferMax: 1
-  });
-
   private currentExecution: plugins.smartshell.IExecResultStreaming;
   private smartchokWatcher = new plugins.smartchok.Smartchok([], {});
   private options: IWatcherConstructorOptions;
@@ -65,16 +50,15 @@ export class Watcher {
     if (typeof this.options.commandToExecute === 'string') {
       if (this.currentExecution) {
         logger.log('ok', `reexecuting ${this.options.commandToExecute}`);
-        process.kill(-this.currentExecution.childProcess.pid);
+        this.currentExecution.kill();
       } else {
         logger.log('ok', `executing ${this.options.commandToExecute} for the first time`);
       }
       this.currentExecution = await this.smartshellInstance.execStreaming(
         this.options.commandToExecute
       );
-      this.currentExecution = null;
     } else {
-      await this.executionTask.trigger();
+      console.log('cannot run execution task');
     }
   }