1.0.60

cli.child.ts

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+process.env.CLI_CALL = 'true';
+import * as cliTool from './ts/index.js';
+cliTool.runCli();

cli.js

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

cli.ts.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
-require('@gitzone/tsrun');
+
-const cliTool = require('./ts/index');
+import * as tsrun from '@gitzone/tsrun';
-cliTool.runCli();
+tsrun.runPath('./cli.child.js', import.meta.url);

package.json

@@ -1,10 +1,11 @@
 {
   "name": "@gitzone/tswatch",
-  "version": "1.0.56",
+  "version": "1.0.60",
   "private": false,
   "description": "watch typescript projects during development",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "bin": {
@@ -15,26 +16,24 @@
     "build": "(tsbuild --web)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.26",
+    "@gitzone/tsbuild": "^2.1.49",
-    "@gitzone/tstest": "^1.0.54",
+    "@gitzone/tstest": "^1.0.67",
-    "@pushrocks/tapbundle": "^3.2.1",
+    "@pushrocks/tapbundle": "^5.0.2",
-    "@types/node": "^16.6.1",
+    "@types/node": "^17.0.21"
-    "tslint": "^6.1.2",
-    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@gitzone/tsrun": "^1.2.17",
+    "@gitzone/tsrun": "^1.2.31",
     "@pushrocks/early": "^3.0.3",
-    "@pushrocks/lik": "^4.0.13",
+    "@pushrocks/lik": "^5.0.4",
     "@pushrocks/smartchok": "^1.0.23",
     "@pushrocks/smartcli": "^3.0.14",
     "@pushrocks/smartdelay": "^2.0.13",
     "@pushrocks/smartlog": "^2.0.44",
     "@pushrocks/smartlog-destination-local": "^8.0.8",
-    "@pushrocks/smartparcel": "^1.0.9",
+    "@pushrocks/smartparcel": "^1.0.13",
     "@pushrocks/smartserve": "^1.1.41",
-    "@pushrocks/smartshell": "^2.0.28",
+    "@pushrocks/smartshell": "^2.0.30",
-    "@pushrocks/taskbuffer": "^2.1.1"
+    "@pushrocks/taskbuffer": "^2.1.17"
   },
   "files": [
     "ts/**/*",

test/test.ts

@@ -1,6 +1,6 @@
 // tslint:disable-next-line: no-implicit-dependencies
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, expectAsync, tap } from '@pushrocks/tapbundle';
-import * as tswatch from '../ts/index';
+import * as tswatch from '../ts/index.js';
 
 let testTsWatchInstance: tswatch.TsWatch;
 

ts/index.ts

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

ts/interfaces/index.ts

@@ -1 +1 @@
-export * from './interfaces.watchmodes';
+export * from './interfaces.watchmodes.js';

ts/tswatch.classes.tswatch.ts

@@ -1,8 +1,8 @@
-import * as plugins from './tswatch.plugins';
+import * as plugins from './tswatch.plugins.js';
-import * as paths from './tswatch.paths';
+import * as paths from './tswatch.paths.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
-import { Watcher } from './tswatch.classes.watcher';
+import { Watcher } from './tswatch.classes.watcher.js';
 
 export class TsWatch {
   public watchmode: interfaces.TWatchModes;
@@ -46,7 +46,7 @@ export class TsWatch {
           plugins.path.join(process.cwd(), './dist_watch'),
           'index.html'
         );
-        await parcel.start();
+        await parcel.watchAndServe();
         break;
       case 'gitzone_website':
         this.watcherMap.add(
@@ -59,11 +59,11 @@ export class TsWatch {
 
         // client directory
         const parcelWebsite = new plugins.smartparcel.Parcel(
-          plugins.path.join(process.cwd(), './ts_web/index.ts'),
+          plugins.path.join(process.cwd(), './html/index.html'),
           plugins.path.join(process.cwd(), './dist_serve'),
           'bundle.js'
         );
-        await parcelWebsite.start();
+        await parcelWebsite.watchAndServe();
         break;
       case 'gitzone_service':
         this.watcherMap.add(

ts/tswatch.classes.watcher.ts

@@ -1,5 +1,5 @@
-import * as plugins from './tswatch.plugins';
+import * as plugins from './tswatch.plugins.js';
-import { logger } from './tswatch.logging';
+import { logger } from './tswatch.logging.js';
 
 export type TCommandFunction = () => Promise<void>;
 

ts/tswatch.cli.ts

@@ -1,8 +1,8 @@
-import * as plugins from './tswatch.plugins';
+import * as plugins from './tswatch.plugins.js';
-import * as paths from './tswatch.paths';
+import * as paths from './tswatch.paths.js';
-import { logger } from './tswatch.logging';
+import { logger } from './tswatch.logging.js';
 
-import { TsWatch } from './tswatch.classes.tswatch';
+import { TsWatch } from './tswatch.classes.tswatch.js';
 
 const tswatchCli = new plugins.smartcli.Smartcli();
 

ts/tswatch.logging.ts

@@ -1,4 +1,4 @@
-import * as plugins from './tswatch.plugins';
+import * as plugins from './tswatch.plugins.js';
 
 export const logger = new plugins.smartlog.Smartlog({
   logContext: {

ts/tswatch.paths.ts

@@ -1,3 +1,3 @@
-import * as plugins from './tswatch.plugins';
+import * as plugins from './tswatch.plugins.js';
 
 export const cwd = process.cwd();

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}