diff --git a/package-lock.json b/package-lock.json index dcc1d7f..88e4adb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -943,9 +943,9 @@ } }, "@gitzone/tsbundle": { - "version": "1.0.50", - "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbundle/-/tsbundle-1.0.50.tgz", - "integrity": "sha512-tAIUziEX7VZZs2ml4NG3jQXmKegHMcQ32QnlFIFXANtgGOpVcM2jYevI4fPXACa5fXaubsoLWRKoiKlyBmg3uw==", + "version": "1.0.51", + "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbundle/-/tsbundle-1.0.51.tgz", + "integrity": "sha512-nLYN9z78FPpCcY1FcBs41xWj9KHfoB2OkAh40rYgPbXkVzl7vSHTshX3wuD4oyXQIHgenKTFLuAjaskb6B2sPA==", "requires": { "@babel/core": "^7.6.2", "@babel/plugin-proposal-class-properties": "^7.5.5", @@ -959,6 +959,7 @@ "@pushrocks/smartlog": "^2.0.21", "@pushrocks/smartlog-destination-local": "^8.0.2", "@types/html-minifier": "^3.5.3", + "@types/node": "^13.9.0", "html-minifier": "^4.0.0", "rollup": "^1.32.0", "rollup-plugin-babel": "^4.3.2", @@ -1031,6 +1032,11 @@ "@types/node": "*" } }, + "@types/node": { + "version": "13.9.0", + "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-13.9.0.tgz", + "integrity": "sha512-0ARSQootUG1RljH2HncpsY2TJBfGQIKOOi7kxzUY6z54ePu/ZD+wJA8zI2Q6v8rol2qpG/rvqsReco8zNMPvhQ==" + }, "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://verdaccio.lossless.one/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -1975,9 +1981,9 @@ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" }, "@types/node": { - "version": "13.7.7", - "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-13.7.7.tgz", - "integrity": "sha512-Uo4chgKbnPNlxQwoFmYIwctkQVkMMmsAoGGU4JKwLuvBefF0pCq4FybNSnfkfRCpC7ZW7kttcC/TrRtAJsvGtg==" + "version": "13.9.0", + "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-13.9.0.tgz", + "integrity": "sha512-0ARSQootUG1RljH2HncpsY2TJBfGQIKOOi7kxzUY6z54ePu/ZD+wJA8zI2Q6v8rol2qpG/rvqsReco8zNMPvhQ==" }, "@types/range-parser": { "version": "1.2.3", @@ -2268,9 +2274,9 @@ "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=" }, "caniuse-lite": { - "version": "1.0.30001032", - "resolved": "https://verdaccio.lossless.one/caniuse-lite/-/caniuse-lite-1.0.30001032.tgz", - "integrity": "sha512-8joOm7BwcpEN4BfVHtfh0hBXSAPVYk+eUIcNntGtMkUWy/6AKRCDZINCLe3kB1vHhT2vBxBF85Hh9VlPXi/qjA==" + "version": "1.0.30001033", + "resolved": "https://verdaccio.lossless.one/caniuse-lite/-/caniuse-lite-1.0.30001033.tgz", + "integrity": "sha512-8Ibzxee6ibc5q88cM1usPsMpJOG5CTq0s/dKOmlekPbDGKt+UrnOOTPSjQz3kVo6yL7N4SB5xd+FGLHQmbzh6A==" }, "chai": { "version": "4.2.0", @@ -2597,9 +2603,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.368", - "resolved": "https://verdaccio.lossless.one/electron-to-chromium/-/electron-to-chromium-1.3.368.tgz", - "integrity": "sha512-fqzDipW3p+uDkHUHFPrdW3wINRKcJsbnJwBD7hgaQEQwcuLSvNLw6SeUp5gKDpTbmTl7zri7IZfhsdTUTnygJg==" + "version": "1.3.372", + "resolved": "https://verdaccio.lossless.one/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", + "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==" }, "encodeurl": { "version": "1.0.2", @@ -2780,9 +2786,9 @@ } }, "find-cache-dir": { - "version": "3.3.0", - "resolved": "https://verdaccio.lossless.one/find-cache-dir/-/find-cache-dir-3.3.0.tgz", - "integrity": "sha512-PtXtQb7IrD8O+h6Cq1dbpJH5NzD8+9keN1zZ0YlpDzl1PwXEJEBj6u1Xa92t1Hwluoozd9TNKul5Hi2iqpsWwg==", + "version": "3.3.1", + "resolved": "https://verdaccio.lossless.one/find-cache-dir/-/find-cache-dir-3.3.1.tgz", + "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", "requires": { "commondir": "^1.0.1", "make-dir": "^3.0.2", @@ -3354,9 +3360,9 @@ "integrity": "sha512-3sLvlfbFo+AxVEY3IqxymbumtnlgBwjDExxK60W3d+trrUzErNAz/PfvPT+mva+vEUrdIodeCOs7fB6zHtRSrw==" }, "magic-string": { - "version": "0.25.6", - "resolved": "https://verdaccio.lossless.one/magic-string/-/magic-string-0.25.6.tgz", - "integrity": "sha512-3a5LOMSGoCTH5rbqobC2HuDNRtE2glHZ8J7pK+QZYppyWA36yuNpsX994rIY2nCuyP7CZYy7lQq/X2jygiZ89g==", + "version": "0.25.7", + "resolved": "https://verdaccio.lossless.one/magic-string/-/magic-string-0.25.7.tgz", + "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==", "requires": { "sourcemap-codec": "^1.4.4" } @@ -3512,9 +3518,9 @@ "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q==" }, "node-releases": { - "version": "1.1.50", - "resolved": "https://verdaccio.lossless.one/node-releases/-/node-releases-1.1.50.tgz", - "integrity": "sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==", + "version": "1.1.51", + "resolved": "https://verdaccio.lossless.one/node-releases/-/node-releases-1.1.51.tgz", + "integrity": "sha512-1eQEs6HFYY1kMXQPOLzCf7HdjReErmvn85tZESMczdCNVWP3Y7URYLBAyYynuI7yef1zj4HN5q+oB2x67QU0lw==", "requires": { "semver": "^6.3.0" }, @@ -3941,9 +3947,9 @@ } }, "rollup": { - "version": "1.32.0", - "resolved": "https://verdaccio.lossless.one/rollup/-/rollup-1.32.0.tgz", - "integrity": "sha512-ab2tF5pdDqm2zuI8j02ceyrJSScl9V2C24FgWQ1v1kTFTu1UrG5H0hpP++mDZlEFyZX4k0chtGEHU2i+pAzBgA==", + "version": "1.32.1", + "resolved": "https://verdaccio.lossless.one/rollup/-/rollup-1.32.1.tgz", + "integrity": "sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==", "requires": { "@types/estree": "*", "@types/node": "*", @@ -3951,9 +3957,9 @@ } }, "rollup-plugin-babel": { - "version": "4.3.3", - "resolved": "https://verdaccio.lossless.one/rollup-plugin-babel/-/rollup-plugin-babel-4.3.3.tgz", - "integrity": "sha512-tKzWOCmIJD/6aKNz0H1GMM+lW1q9KyFubbWzGiOG540zxPPifnEAHTZwjo0g991Y+DyOZcLqBgqOdqazYE5fkw==", + "version": "4.4.0", + "resolved": "https://verdaccio.lossless.one/rollup-plugin-babel/-/rollup-plugin-babel-4.4.0.tgz", + "integrity": "sha512-Lek/TYp1+7g7I+uMfJnnSJ7YWoD58ajo6Oarhlex7lvUce+RCKRuGRSgztDO3/MF/PuGKmUL5iTHKf208UNszw==", "requires": { "@babel/helper-module-imports": "^7.0.0", "rollup-pluginutils": "^2.8.1" diff --git a/package.json b/package.json index e5cad24..68b0e14 100644 --- a/package.json +++ b/package.json @@ -18,12 +18,12 @@ "@gitzone/tsbuild": "^2.1.17", "@gitzone/tstest": "^1.0.28", "@pushrocks/tapbundle": "^3.2.0", - "@types/node": "^13.7.7", + "@types/node": "^13.9.0", "tslint": "^6.0.0", "tslint-config-prettier": "^1.18.0" }, "dependencies": { - "@gitzone/tsbundle": "^1.0.50", + "@gitzone/tsbundle": "^1.0.51", "@gitzone/tsrun": "^1.2.8", "@pushrocks/early": "^3.0.3", "@pushrocks/lik": "^3.0.19", diff --git a/ts/tswatch.classes.tswatch.ts b/ts/tswatch.classes.tswatch.ts index 28bc157..3e8483b 100644 --- a/ts/tswatch.classes.tswatch.ts +++ b/ts/tswatch.classes.tswatch.ts @@ -38,10 +38,11 @@ export class TsWatch { break; case 'gitzone_element': // lets create a standard server + 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_web/') + serveDir: plugins.path.join(paths.cwd, './dist_watch/') }); this.watcherMap.add( new Watcher({ @@ -49,8 +50,8 @@ export class TsWatch { commandToExecute: async () => { const tsbundle = new plugins.tsbundle.TsBundle(); const htmlHandler = new plugins.tsbundle.HtmlHandler(); - await tsbundle.buildProduction('./ts_web/index.ts', './dist_web/bundle.js'); - await htmlHandler.copyHtml(); + await tsbundle.buildTest('./ts_web/index.ts', './dist_watch/bundle.js'); + await htmlHandler.copyHtml(plugins.path.join(process.cwd(), './dist_watch/index.html')); }, timeout: null }) @@ -98,6 +99,7 @@ export class TsWatch { await watcher.start(); }); if (this.smartserve) { + await this.smartserve.start(); } }