2.0.3

dist_ts/tswatch.plugins.d.ts

@@ -8,8 +8,7 @@ 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';
-export { lik, smartchok, smartcli, smartdelay, smartlog, smartlogDestinationLocal, smartparcel, smartserve, smartshell, taskbuffer, };
+export { lik, smartchok, smartcli, smartdelay, smartlog, smartlogDestinationLocal, smartserve, smartshell, taskbuffer, };

dist_ts/tswatch.plugins.js

@@ -11,9 +11,8 @@ 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';
-export { lik, smartchok, smartcli, smartdelay, smartlog, smartlogDestinationLocal, smartparcel, smartserve, smartshell, taskbuffer, };
+export { lik, smartchok, smartcli, smartdelay, smartlog, smartlogDestinationLocal, smartserve, smartshell, taskbuffer, };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvdHN3YXRjaC5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLG9CQUFvQjtBQUNwQixPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQztBQUM3QixPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUM7QUFFaEIsaUJBQWlCO0FBQ2pCLE9BQU8sS0FBSyxRQUFRLE1BQU0sbUJBQW1CLENBQUM7QUFDOUMsT0FBTyxFQUNMLFFBQVEsRUFDVCxDQUFBO0FBRUQsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxHQUFHLE1BQU0sZ0JBQWdCLENBQUM7QUFDdEMsT0FBTyxLQUFLLFNBQVMsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRCxPQUFPLEtBQUssUUFBUSxNQUFNLHFCQUFxQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxVQUFVLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLFFBQVEsTUFBTSxxQkFBcUIsQ0FBQztBQUNoRCxPQUFPLEtBQUssd0JBQXdCLE1BQU0sdUNBQXVDLENBQUM7QUFDbEYsT0FBTyxLQUFLLFdBQVcsTUFBTSx3QkFBd0IsQ0FBQztBQUN0RCxPQUFPLEtBQUssVUFBVSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxVQUFVLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLFVBQVUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEVBQ0wsR0FBRyxFQUNILFNBQVMsRUFDVCxRQUFRLEVBQ1IsVUFBVSxFQUNWLFFBQVEsRUFDUix3QkFBd0IsRUFDeEIsV0FBVyxFQUNYLFVBQVUsRUFDVixVQUFVLEVBQ1YsVUFBVSxHQUNYLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvdHN3YXRjaC5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLG9CQUFvQjtBQUNwQixPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQztBQUM3QixPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUM7QUFFaEIsaUJBQWlCO0FBQ2pCLE9BQU8sS0FBSyxRQUFRLE1BQU0sbUJBQW1CLENBQUM7QUFDOUMsT0FBTyxFQUNMLFFBQVEsRUFDVCxDQUFBO0FBRUQsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxHQUFHLE1BQU0sZ0JBQWdCLENBQUM7QUFDdEMsT0FBTyxLQUFLLFNBQVMsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRCxPQUFPLEtBQUssUUFBUSxNQUFNLHFCQUFxQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxVQUFVLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLFFBQVEsTUFBTSxxQkFBcUIsQ0FBQztBQUNoRCxPQUFPLEtBQUssd0JBQXdCLE1BQU0sdUNBQXVDLENBQUM7QUFDbEYsT0FBTyxLQUFLLFVBQVUsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRCxPQUFPLEtBQUssVUFBVSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxVQUFVLE1BQU0sdUJBQXVCLENBQUM7QUFFcEQsT0FBTyxFQUNMLEdBQUcsRUFDSCxTQUFTLEVBQ1QsUUFBUSxFQUNSLFVBQVUsRUFDVixRQUFRLEVBQ1Isd0JBQXdCLEVBQ3hCLFVBQVUsRUFDVixVQUFVLEVBQ1YsVUFBVSxHQUNYLENBQUMifQ==

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tswatch",
-  "version": "1.0.73",
+  "version": "2.0.3",
   "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.65",
-    "@gitzone/tstest": "^1.0.69",
+    "@gitzone/tstest": "^1.0.73",
-    "@pushrocks/tapbundle": "^5.0.2",
+    "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^17.0.21"
+    "@types/node": "^18.6.3"
   },
   "dependencies": {
-    "@gitzone/tsbundle": "^1.0.100",
+    "@gitzone/tsbundle": "^2.0.7",
-    "@gitzone/tsrun": "^1.2.31",
+    "@gitzone/tsrun": "^1.2.37",
-    "@pushrocks/early": "^3.0.3",
+    "@pushrocks/early": "^4.0.3",
-    "@pushrocks/lik": "^5.0.4",
+    "@pushrocks/lik": "^6.0.0",
     "@pushrocks/smartchok": "^1.0.23",
-    "@pushrocks/smartcli": "^3.0.14",
+    "@pushrocks/smartcli": "^4.0.3",
     "@pushrocks/smartdelay": "^2.0.13",
-    "@pushrocks/smartlog": "^2.0.44",
+    "@pushrocks/smartlog": "^3.0.1",
     "@pushrocks/smartlog-destination-local": "^8.0.8",
-    "@pushrocks/smartserve": "^2.0.2",
+    "@pushrocks/smartserve": "^2.0.28",
     "@pushrocks/smartshell": "^2.0.30",
-    "@pushrocks/taskbuffer": "^2.1.17"
+    "@pushrocks/taskbuffer": "^3.0.2"
   },
   "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.3',
+  description: 'watch typescript projects during development'
+}

ts/tswatch.classes.tswatch.ts

@@ -48,13 +48,13 @@ export class TsWatch {
           serveDir: plugins.path.join(paths.cwd, './dist_watch/'),
           port: 3002,
         });
-        
+
         const bundleAndReloadElement = async () => {
           await tsbundle.build(paths.cwd, './html/index.ts', './dist_watch/bundle.js', {
-            bundler: 'esbuild'
+            bundler: 'esbuild',
           });
           await smartserve.reload();
-        }
+        };
         this.watcherMap.add(
           new Watcher({
             filePathToWatch: plugins.path.join(paths.cwd, './ts_web/'),
@@ -68,28 +68,17 @@ export class TsWatch {
           new Watcher({
             filePathToWatch: plugins.path.join(paths.cwd, './html/'),
             functionToCall: async () => {
-              await htmlHandler.copyHtml(
+              await htmlHandler.processHtml({
-                plugins.path.join(
+                from: plugins.path.join(paths.cwd, './html/index.html'),
-                  paths.cwd,
+                to: plugins.path.join(paths.cwd, './dist_watch/index.html'),
-                  './html/index.html'
+                minify: false,
-                ),
+              });
-                plugins.path.join(
-                  paths.cwd,
-                  './dist_watch/index.html'
-                )
-              );
               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(
@@ -101,9 +90,9 @@ export class TsWatch {
         );
         const bundleAndReloadWebsite = async () => {
           await tsbundle.build(paths.cwd, './ts_web/index.ts', './dist_serve/bundle.js', {
-            bundler: 'esbuild'
+            bundler: 'esbuild',
           });
-        }
+        };
         this.watcherMap.add(
           new Watcher({
             filePathToWatch: plugins.path.join(paths.cwd, './ts_web/'),
@@ -117,29 +106,16 @@ export class TsWatch {
           new Watcher({
             filePathToWatch: plugins.path.join(paths.cwd, './html/'),
             functionToCall: async () => {
-              await htmlHandler.copyHtml(
+              await htmlHandler.processHtml({
-                plugins.path.join(
+                from: plugins.path.join(paths.cwd, './html/index.html'),
-                  paths.cwd,
+                to: plugins.path.join(paths.cwd, './dist_serve/index.html'),
-                  './html/index.html'
+                minify: false,
-                ),
+              });
-                plugins.path.join(
-                  paths.cwd,
-                  './dist_serve/index.html'
-                )
-              );
               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.cli.ts

@@ -7,6 +7,9 @@ import { TsWatch } from './tswatch.classes.tswatch.js';
 const tswatchCli = new plugins.smartcli.Smartcli();
 
 // standard behaviour will assume gitzone setup
+tswatchCli.standardCommand().subscribe((argvArg => {
+  tswatchCli.triggerCommand('npm', {});
+}))
 
 tswatchCli.addCommand('element').subscribe(async (argvArg) => {
   logger.log('info', `running watch task for a gitzone element project`);

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,

tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "esModuleInterop": true
+  }
+}