diff --git a/cli.js b/cli.js index a89c9c5..b854fb3 100644 --- a/cli.js +++ b/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(); diff --git a/cli.ts.js b/cli.ts.js index f700436..f5dd4cf 100644 --- a/cli.ts.js +++ b/cli.ts.js @@ -1,5 +1,5 @@ #!/usr/bin/env node process.env.CLI_CALL = 'true'; -require('@gitzone/tsrun'); -const cliTool = require('./ts/index'); +await import('@gitzone/tsrun'); +const cliTool = await import('./ts/index.js'); cliTool.runCli(); diff --git a/package-lock.json b/package-lock.json index c7911d7..519d39f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "tsrun": "cli.js" }, "devDependencies": { - "@gitzone/tsbuild": "2.1.29", + "@gitzone/tsbuild": "^2.1.43", "@types/node": "^17.0.21", "node-fetch": "^3.2.2", "tslint": "^6.1.2", @@ -91,64 +91,36 @@ } }, "node_modules/@gitzone/tsbuild": { - "version": "2.1.29", - "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbuild/-/tsbuild-2.1.29.tgz", - "integrity": "sha512-rS0WlwXKb0W+gjFvVgcr1h+ZWRQTBwDm9RylEipPsDb+RmbTYKFT1xtoS53TWAgSKJouknVfsLowbSEic9+75g==", + "version": "2.1.43", + "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbuild/-/tsbuild-2.1.43.tgz", + "integrity": "sha512-7vWO3Od03JGXQzmrdFahsgNST5LpaJjOREL1lvO1gUfbOIyJiFLr/SpI2pRTKd181YETbXu1RCp8VoVyJP3YDg==", "dev": true, "license": "MIT", "dependencies": { "@pushrocks/early": "^3.0.6", "@pushrocks/smartcli": "^3.0.14", - "@pushrocks/smartfile": "^8.0.10", + "@pushrocks/smartfile": "^9.0.6", "@pushrocks/smartlog": "^2.0.44", "@pushrocks/smartpath": "^4.0.3", - "@pushrocks/smartpromise": "^3.1.6", - "typescript": "^4.4.2" + "@pushrocks/smartpromise": "^3.1.7", + "typescript": "4.7.0-dev.20220311" }, "bin": { "tsbuild": "cli.js" } }, - "node_modules/@gitzone/tsbuild/node_modules/@pushrocks/smartfile": { - "version": "8.0.11", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartfile/-/smartfile-8.0.11.tgz", - "integrity": "sha512-mujs1mDgorsryQ8OZuL94MZZDYL3+cbdPKaXSchPjyxOOx8iGacUzc5BK4jDsImYeYEo07MpdJ5BjvGkORQR/w==", + "node_modules/@gitzone/tsbuild/node_modules/typescript": { + "version": "4.7.0-dev.20220311", + "resolved": "https://verdaccio.lossless.one/typescript/-/typescript-4.7.0-dev.20220311.tgz", + "integrity": "sha512-ZNMv/ta7e5SqRO591yC36VBmsM4+S6u60MFW3xOwKrrm/RbPCNJjwS+lmSY57avA0VIAUnokWlm+ThWBNo0awQ==", "dev": true, - "license": "MIT", - "dependencies": { - "@pushrocks/smartfile-interfaces": "^1.0.7", - "@pushrocks/smarthash": "^2.1.10", - "@pushrocks/smartjson": "^4.0.6", - "@pushrocks/smartmime": "^1.0.5", - "@pushrocks/smartpath": "^4.0.3", - "@pushrocks/smartpromise": "^3.1.6", - "@pushrocks/smartrequest": "^1.1.52", - "@types/fs-extra": "^9.0.13", - "@types/glob": "^7.2.0", - "@types/js-yaml": "^4.0.5", - "fs-extra": "^10.0.0", - "glob": "^7.2.0", - "js-yaml": "^4.1.0" - } - }, - "node_modules/@gitzone/tsbuild/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://verdaccio.lossless.one/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true, - "license": "Python-2.0" - }, - "node_modules/@gitzone/tsbuild/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://verdaccio.lossless.one/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, + "license": "Apache-2.0", "bin": { - "js-yaml": "bin/js-yaml.js" + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" } }, "node_modules/@pushrocks/consolecolor": { @@ -1806,55 +1778,25 @@ } }, "@gitzone/tsbuild": { - "version": "2.1.29", - "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbuild/-/tsbuild-2.1.29.tgz", - "integrity": "sha512-rS0WlwXKb0W+gjFvVgcr1h+ZWRQTBwDm9RylEipPsDb+RmbTYKFT1xtoS53TWAgSKJouknVfsLowbSEic9+75g==", + "version": "2.1.43", + "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbuild/-/tsbuild-2.1.43.tgz", + "integrity": "sha512-7vWO3Od03JGXQzmrdFahsgNST5LpaJjOREL1lvO1gUfbOIyJiFLr/SpI2pRTKd181YETbXu1RCp8VoVyJP3YDg==", "dev": true, "requires": { "@pushrocks/early": "^3.0.6", "@pushrocks/smartcli": "^3.0.14", - "@pushrocks/smartfile": "^8.0.10", + "@pushrocks/smartfile": "^9.0.6", "@pushrocks/smartlog": "^2.0.44", "@pushrocks/smartpath": "^4.0.3", - "@pushrocks/smartpromise": "^3.1.6", - "typescript": "^4.4.2" + "@pushrocks/smartpromise": "^3.1.7", + "typescript": "4.7.0-dev.20220311" }, "dependencies": { - "@pushrocks/smartfile": { - "version": "8.0.11", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartfile/-/smartfile-8.0.11.tgz", - "integrity": "sha512-mujs1mDgorsryQ8OZuL94MZZDYL3+cbdPKaXSchPjyxOOx8iGacUzc5BK4jDsImYeYEo07MpdJ5BjvGkORQR/w==", - "dev": true, - "requires": { - "@pushrocks/smartfile-interfaces": "^1.0.7", - "@pushrocks/smarthash": "^2.1.10", - "@pushrocks/smartjson": "^4.0.6", - "@pushrocks/smartmime": "^1.0.5", - "@pushrocks/smartpath": "^4.0.3", - "@pushrocks/smartpromise": "^3.1.6", - "@pushrocks/smartrequest": "^1.1.52", - "@types/fs-extra": "^9.0.13", - "@types/glob": "^7.2.0", - "@types/js-yaml": "^4.0.5", - "fs-extra": "^10.0.0", - "glob": "^7.2.0", - "js-yaml": "^4.1.0" - } - }, - "argparse": { - "version": "2.0.1", - "resolved": "https://verdaccio.lossless.one/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "typescript": { + "version": "4.7.0-dev.20220311", + "resolved": "https://verdaccio.lossless.one/typescript/-/typescript-4.7.0-dev.20220311.tgz", + "integrity": "sha512-ZNMv/ta7e5SqRO591yC36VBmsM4+S6u60MFW3xOwKrrm/RbPCNJjwS+lmSY57avA0VIAUnokWlm+ThWBNo0awQ==", "dev": true - }, - "js-yaml": { - "version": "4.1.0", - "resolved": "https://verdaccio.lossless.one/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "requires": { - "argparse": "^2.0.1" - } } } }, diff --git a/package.json b/package.json index 5a4cd03..eec97e4 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "build": "(tsbuild)" }, "devDependencies": { - "@gitzone/tsbuild": "2.1.29", + "@gitzone/tsbuild": "^2.1.43", "@types/node": "^17.0.21", "node-fetch": "^3.2.2", "tslint": "^6.1.2",