diff --git a/cli.js b/cli.js index b854fb3..a89c9c5 100644 --- a/cli.js +++ b/cli.js @@ -1,4 +1,4 @@ #!/usr/bin/env node process.env.CLI_CALL = 'true'; -const cliTool = await import('./dist_ts/index.js'); +const cliTool = require('./dist_ts/index'); cliTool.runCli(); diff --git a/cli.ts.js b/cli.ts.js index f5dd4cf..f700436 100644 --- a/cli.ts.js +++ b/cli.ts.js @@ -1,5 +1,5 @@ #!/usr/bin/env node process.env.CLI_CALL = 'true'; -await import('@gitzone/tsrun'); -const cliTool = await import('./ts/index.js'); +require('@gitzone/tsrun'); +const cliTool = require('./ts/index'); cliTool.runCli(); diff --git a/package-lock.json b/package-lock.json index 7de70f6..46c9ba1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "tsbuild": "cli.js" }, "devDependencies": { - "@gitzone/tsrun": "^1.2.19", + "@gitzone/tsrun": "1.2.18", "@pushrocks/tapbundle": "^4.0.8", "@types/node": "^17.0.21", "tslint": "^6.1.3", @@ -176,20 +176,62 @@ } }, "node_modules/@gitzone/tsrun": { - "version": "1.2.19", - "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsrun/-/tsrun-1.2.19.tgz", - "integrity": "sha512-GmJSpbx0uij7G06FhvURnSSfJ5O9U2NNXD0I3QE5BhFmBH/7otk4sovrytU7p4hYdgzhcvZ6jRrmMxaspiia7A==", + "version": "1.2.18", + "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsrun/-/tsrun-1.2.18.tgz", + "integrity": "sha512-DI08qVwVu61zrQlp5/+NVPGH/TsF2x8OGgyxK+xGayIKH9MLRXxX6NT9OK8+FOyCqyJNYfxDunmlK4rlnFCJ7w==", "dev": true, "license": "MIT", "dependencies": { - "@pushrocks/smartfile": "^9.0.6", - "ts-node": "^10.7.0", - "typescript": "^4.6.2" + "@pushrocks/smartfile": "^8.0.10", + "ts-node": "^10.2.1", + "typescript": "^4.4.3" }, "bin": { "tsrun": "cli.js" } }, + "node_modules/@gitzone/tsrun/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==", + "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/tsrun/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/tsrun/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" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/@gitzone/tsrun/node_modules/ts-node": { "version": "10.7.0", "resolved": "https://verdaccio.lossless.one/ts-node/-/ts-node-10.7.0.tgz", @@ -1897,16 +1939,52 @@ } }, "@gitzone/tsrun": { - "version": "1.2.19", - "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsrun/-/tsrun-1.2.19.tgz", - "integrity": "sha512-GmJSpbx0uij7G06FhvURnSSfJ5O9U2NNXD0I3QE5BhFmBH/7otk4sovrytU7p4hYdgzhcvZ6jRrmMxaspiia7A==", + "version": "1.2.18", + "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsrun/-/tsrun-1.2.18.tgz", + "integrity": "sha512-DI08qVwVu61zrQlp5/+NVPGH/TsF2x8OGgyxK+xGayIKH9MLRXxX6NT9OK8+FOyCqyJNYfxDunmlK4rlnFCJ7w==", "dev": true, "requires": { - "@pushrocks/smartfile": "^9.0.6", - "ts-node": "^10.7.0", - "typescript": "^4.6.2" + "@pushrocks/smartfile": "^8.0.10", + "ts-node": "^10.2.1", + "typescript": "^4.4.3" }, "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==", + "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" + } + }, "ts-node": { "version": "10.7.0", "resolved": "https://verdaccio.lossless.one/ts-node/-/ts-node-10.7.0.tgz", diff --git a/package.json b/package.json index 3ff7ba3..b7bfdfd 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,6 @@ "description": "TypeScript nightly to easily make use of latest features", "main": "dist_ts/index.js", "typings": "dist_ts/index.d.ts", - "type": "module", "bin": { "tsbuild": "./cli.js" }, @@ -37,7 +36,7 @@ "typescript": "4.7.0-dev.20220311" }, "devDependencies": { - "@gitzone/tsrun": "^1.2.19", + "@gitzone/tsrun": "1.2.18", "@pushrocks/tapbundle": "^4.0.8", "@types/node": "^17.0.21", "tslint": "^6.1.3", diff --git a/ts/index.ts b/ts/index.ts index 3cfdfba..818c916 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -1,5 +1,5 @@ import * as early from '@pushrocks/early'; early.start('tsbuild'); -export * from './tsbuild.exports.js'; -export * from './tsbuild.cli.js'; +export * from './tsbuild.exports'; +export * from './tsbuild.cli'; early.stop(); \ No newline at end of file diff --git a/ts/tsbuild.classes.compiler.ts b/ts/tsbuild.classes.compiler.ts index 074e7df..1a4b8b9 100644 --- a/ts/tsbuild.classes.compiler.ts +++ b/ts/tsbuild.classes.compiler.ts @@ -1,5 +1,5 @@ // import all the stuff we need -import * as plugins from './tsbuild.plugins.js'; +import * as plugins from './tsbuild.plugins'; import { CompilerOptions } from 'typescript'; export { CompilerOptions, ScriptTarget, ModuleKind } from 'typescript'; diff --git a/ts/tsbuild.cli.ts b/ts/tsbuild.cli.ts index 8f53b7e..d98be4c 100644 --- a/ts/tsbuild.cli.ts +++ b/ts/tsbuild.cli.ts @@ -1,5 +1,5 @@ -import * as plugins from './tsbuild.plugins.js'; -import * as tsbuild from './tsbuild.exports.js'; +import * as plugins from './tsbuild.plugins'; +import * as tsbuild from './tsbuild.exports'; export const runCli = async () => { const tsbuildCli = new plugins.smartcli.Smartcli(); diff --git a/ts/tsbuild.exports.ts b/ts/tsbuild.exports.ts index b843d7b..4e54ffd 100644 --- a/ts/tsbuild.exports.ts +++ b/ts/tsbuild.exports.ts @@ -1,5 +1,5 @@ -import * as plugins from './tsbuild.plugins.js'; -import { compiler, CompilerOptions, mergeCompilerOptions } from './tsbuild.classes.compiler.js'; +import * as plugins from './tsbuild.plugins'; +import { compiler, CompilerOptions, mergeCompilerOptions } from './tsbuild.classes.compiler'; export * from './tsbuild.classes.compiler';