2.0.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tswatch",
-  "version": "1.0.68",
+  "version": "2.0.0",
   "private": false,
   "description": "watch typescript projects during development",
   "main": "dist_ts/index.js",
@@ -13,27 +13,27 @@
   },
   "scripts": {
     "test": "(tstest test/ --web)",
-    "build": "(tsbuild --web --skiplibcheck --allowimplicitany)"
+    "build": "(tsbuild --web --allowimplicitany)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.59",
+    "@gitzone/tsbuild": "^2.1.61",
-    "@gitzone/tstest": "^1.0.69",
+    "@gitzone/tstest": "^1.0.70",
-    "@pushrocks/tapbundle": "^5.0.2",
+    "@pushrocks/tapbundle": "^5.0.3",
-    "@types/node": "^17.0.21"
+    "@types/node": "^17.0.31"
   },
   "dependencies": {
-    "@gitzone/tsbundle": "^1.0.100",
+    "@gitzone/tsbundle": "^2.0.0",
-    "@gitzone/tsrun": "^1.2.31",
+    "@gitzone/tsrun": "^1.2.32",
-    "@pushrocks/early": "^3.0.3",
+    "@pushrocks/early": "^4.0.2",
     "@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/smartserve": "^2.0.2",
+    "@pushrocks/smartserve": "^2.0.27",
     "@pushrocks/smartshell": "^2.0.30",
-    "@pushrocks/taskbuffer": "^2.1.17"
+    "@pushrocks/taskbuffer": "^3.0.1"
   },
   "files": [
     "ts/**/*",

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@gitzone/tswatch',
+  version: '2.0.0',
+  description: 'watch typescript projects during development'
+}

ts/tswatch.classes.tswatch.ts

@@ -17,6 +17,8 @@ export class TsWatch {
    * starts the TsWatch instance
    */
   public async start() {
+    const tsbundle = new plugins.tsbundle.TsBundle();
+    const htmlHandler = new plugins.tsbundle.HtmlHandler();
     switch (this.watchmode) {
       case 'test':
         this.watcherMap.add(
@@ -46,9 +48,8 @@ export class TsWatch {
           serveDir: plugins.path.join(paths.cwd, './dist_watch/'),
           port: 3002,
         });
-        const tsbundle = new plugins.tsbundle.TsBundle();
+        
-        const htmlHandler = new plugins.tsbundle.HtmlHandler();
+        const bundleAndReloadElement = async () => {
-        const bundleAndReload = async () => {
           await tsbundle.build(paths.cwd, './html/index.ts', './dist_watch/bundle.js', {
             bundler: 'esbuild'
           });
@@ -58,7 +59,7 @@ export class TsWatch {
           new Watcher({
             filePathToWatch: plugins.path.join(paths.cwd, './ts_web/'),
             functionToCall: async () => {
-              await bundleAndReload();
+              await bundleAndReloadElement();
             },
             timeout: null,
           })
@@ -77,18 +78,12 @@ export class TsWatch {
                   './dist_watch/index.html'
                 )
               );
-              await bundleAndReload();
+              await bundleAndReloadElement();
             },
             timeout: null,
           })
         );
         await smartserve.start();
-        /* const parcel = new plugins.smartparcel.Parcel(
-          plugins.path.join(process.cwd(), './html/index.html'),
-          plugins.path.join(process.cwd(), './dist_watch'),
-          'index.html'
-        );
-        await parcel.watchAndServe(); */
         break;
       case 'gitzone_website':
         this.watcherMap.add(
@@ -98,17 +93,16 @@ export class TsWatch {
             timeout: null,
           })
         );
-        const bundleAndReload2 = async () => {
+        const bundleAndReloadWebsite = async () => {
           await tsbundle.build(paths.cwd, './ts_web/index.ts', './dist_serve/bundle.js', {
             bundler: 'esbuild'
           });
-          await smartserve.reload();
         }
         this.watcherMap.add(
           new Watcher({
             filePathToWatch: plugins.path.join(paths.cwd, './ts_web/'),
             functionToCall: async () => {
-              await bundleAndReload2();
+              await bundleAndReloadWebsite();
             },
             timeout: null,
           })
@@ -124,22 +118,14 @@ export class TsWatch {
                 ),
                 plugins.path.join(
                   paths.cwd,
-                  './dist_watch/index.html'
+                  './dist_serve/index.html'
                 )
               );
-              await bundleAndReload();
+              await bundleAndReloadWebsite();
             },
             timeout: null,
           })
         );
-
-        // client directory
-        /* const parcelWebsite = new plugins.smartparcel.Parcel(
-          plugins.path.join(process.cwd(), './html/index.html'),
-          plugins.path.join(process.cwd(), './dist_serve'),
-          'bundle.js'
-        );
-        await parcelWebsite.watchAndServe(); */
         break;
       case 'gitzone_service':
         this.watcherMap.add(

ts/tswatch.plugins.ts

@@ -15,7 +15,6 @@ import * as smartcli from '@pushrocks/smartcli';
 import * as smartdelay from '@pushrocks/smartdelay';
 import * as smartlog from '@pushrocks/smartlog';
 import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
-import * as smartparcel from '@pushrocks/smartparcel';
 import * as smartserve from '@pushrocks/smartserve';
 import * as smartshell from '@pushrocks/smartshell';
 import * as taskbuffer from '@pushrocks/taskbuffer';
@@ -27,7 +26,6 @@ export {
   smartdelay,
   smartlog,
   smartlogDestinationLocal,
-  smartparcel,
   smartserve,
   smartshell,
   taskbuffer,