1.0.75

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tswatch",
-  "version": "1.0.66",
+  "version": "1.0.75",
   "private": false,
   "description": "watch typescript projects during development",
   "main": "dist_ts/index.js",
@@ -16,24 +16,24 @@
     "build": "(tsbuild --web --skiplibcheck --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.23"
   },
   "dependencies": {
-    "@gitzone/tsbundle": "^1.0.100",
+    "@gitzone/tsbundle": "^1.0.102",
-    "@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.12",
     "@pushrocks/smartshell": "^2.0.30",
-    "@pushrocks/taskbuffer": "^2.1.17"
+    "@pushrocks/taskbuffer": "^3.0.0"
   },
   "files": [
     "ts/**/*",

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,10 +48,9 @@ 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', {
-          await tsbundle.build(paths.cwd, './ts_web/index.ts', './dist_watch/bundle.js', {
             bundler: 'esbuild'
           });
           await smartserve.reload();
@@ -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,7 +78,7 @@ export class TsWatch {
                   './dist_watch/index.html'
                 )
               );
-              await bundleAndReload();
+              await bundleAndReloadElement();
             },
             timeout: null,
           })
@@ -98,17 +99,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,10 +124,10 @@ export class TsWatch {
                 ),
                 plugins.path.join(
                   paths.cwd,
-                  './dist_watch/index.html'
+                  './dist_serve/index.html'
                 )
               );
-              await bundleAndReload();
+              await bundleAndReloadWebsite();
             },
             timeout: null,
           })