From 9adbce12e1a40e1cf8cf0fd00beb056b22a836f3 Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Sat, 12 Mar 2022 19:05:46 +0100 Subject: [PATCH] fix(core): update --- package-lock.json | 223 +++++++++++++++++++------------- package.json | 3 +- test/assets/output/tocompile.js | 4 +- test/assets/tocompile.ts | 2 +- test/test.ts | 2 +- ts/index.ts | 4 +- ts/tsbuild.classes.compiler.ts | 10 +- ts/tsbuild.cli.ts | 4 +- ts/tsbuild.exports.ts | 7 +- 9 files changed, 151 insertions(+), 108 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8864c3d..d2c5488 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "tsbuild": "cli.js" }, "devDependencies": { - "@gitzone/tsrun": "1.2.18", + "@gitzone/tsrun": "^1.2.24", "@pushrocks/tapbundle": "^4.0.8", "@types/node": "^17.0.21", "tslint": "^6.1.3", @@ -176,62 +176,21 @@ } }, "node_modules/@gitzone/tsrun": { - "version": "1.2.18", - "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsrun/-/tsrun-1.2.18.tgz", - "integrity": "sha512-DI08qVwVu61zrQlp5/+NVPGH/TsF2x8OGgyxK+xGayIKH9MLRXxX6NT9OK8+FOyCqyJNYfxDunmlK4rlnFCJ7w==", + "version": "1.2.24", + "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsrun/-/tsrun-1.2.24.tgz", + "integrity": "sha512-8tbIEJguEY9iX4rJu7ntD+yd5EnqvNZu7NjOWJF6iyJrdFFZmV3p3Cl7uWfnNF6188Mym0TR+GcabtDGWqnXZw==", "dev": true, "license": "MIT", "dependencies": { - "@pushrocks/smartfile": "^8.0.10", - "ts-node": "^10.2.1", - "typescript": "^4.4.3" + "@pushrocks/smartfile": "^9.0.6", + "@pushrocks/smartshell": "^2.0.30", + "ts-node": "^10.7.0", + "typescript": "4.7.0-dev.20220311" }, "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", @@ -403,6 +362,17 @@ "dev": true, "license": "MIT" }, + "node_modules/@pushrocks/smartexit": { + "version": "1.0.20", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexit/-/smartexit-1.0.20.tgz", + "integrity": "sha512-u/KgA7s2zAtZ7gZvL13HZbO3mZATvjfCLU8Ez6h8VweG8UsIBVaPfYziMDCmJOWIPYLGzEW8eG/u4mCHuyLBow==", + "dev": true, + "license": "MIT", + "dependencies": { + "@pushrocks/lik": "^4.0.20", + "@pushrocks/smartdelay": "^2.0.3" + } + }, "node_modules/@pushrocks/smartexpect": { "version": "1.0.12", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexpect/-/smartexpect-1.0.12.tgz", @@ -600,6 +570,21 @@ "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", "license": "0BSD" }, + "node_modules/@pushrocks/smartshell": { + "version": "2.0.30", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartshell/-/smartshell-2.0.30.tgz", + "integrity": "sha512-HPgdTFzfzhk2TQau/jVdYNSANlxyBZdqq2vyZ+bZahegVHfH/27Zur5Fk+2vE16VJjJMqP7zcvDITUe2+ipgJg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@pushrocks/smartdelay": "^2.0.13", + "@pushrocks/smartexit": "^1.0.20", + "@pushrocks/smartpromise": "^3.1.6", + "@types/which": "^2.0.1", + "tree-kill": "^1.2.2", + "which": "^2.0.2" + } + }, "node_modules/@pushrocks/smarttime": { "version": "3.0.45", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarttime/-/smarttime-3.0.45.tgz", @@ -747,6 +732,13 @@ "@types/node": "*" } }, + "node_modules/@types/which": { + "version": "2.0.1", + "resolved": "https://verdaccio.lossless.one/@types%2fwhich/-/which-2.0.1.tgz", + "integrity": "sha512-Jjakcv8Roqtio6w1gr0D7y6twbhx6gGgFGF5BLwajPpnOIOxFkakFhCq+LmyyeAz7BX6ULrjBOxdKaCDy+4+dQ==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/yargs": { "version": "16.0.4", "resolved": "https://verdaccio.lossless.one/@types%2fyargs/-/yargs-16.0.4.tgz", @@ -1316,6 +1308,13 @@ "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==", "license": "MIT" }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://verdaccio.lossless.one/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true, + "license": "ISC" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://verdaccio.lossless.one/js-tokens/-/js-tokens-4.0.0.tgz", @@ -1654,6 +1653,16 @@ "readable-stream": "3" } }, + "node_modules/tree-kill": { + "version": "1.2.2", + "resolved": "https://verdaccio.lossless.one/tree-kill/-/tree-kill-1.2.2.tgz", + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", + "dev": true, + "license": "MIT", + "bin": { + "tree-kill": "cli.js" + } + }, "node_modules/tslib": { "version": "1.13.0", "resolved": "https://verdaccio.lossless.one/tslib/-/tslib-1.13.0.tgz", @@ -1753,6 +1762,22 @@ "dev": true, "license": "MIT" }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://verdaccio.lossless.one/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://verdaccio.lossless.one/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -1939,52 +1964,17 @@ } }, "@gitzone/tsrun": { - "version": "1.2.18", - "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsrun/-/tsrun-1.2.18.tgz", - "integrity": "sha512-DI08qVwVu61zrQlp5/+NVPGH/TsF2x8OGgyxK+xGayIKH9MLRXxX6NT9OK8+FOyCqyJNYfxDunmlK4rlnFCJ7w==", + "version": "1.2.24", + "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsrun/-/tsrun-1.2.24.tgz", + "integrity": "sha512-8tbIEJguEY9iX4rJu7ntD+yd5EnqvNZu7NjOWJF6iyJrdFFZmV3p3Cl7uWfnNF6188Mym0TR+GcabtDGWqnXZw==", "dev": true, "requires": { - "@pushrocks/smartfile": "^8.0.10", - "ts-node": "^10.2.1", - "typescript": "^4.4.3" + "@pushrocks/smartfile": "^9.0.6", + "@pushrocks/smartshell": "^2.0.30", + "ts-node": "^10.7.0", + "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==", - "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", @@ -2118,6 +2108,16 @@ } } }, + "@pushrocks/smartexit": { + "version": "1.0.20", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexit/-/smartexit-1.0.20.tgz", + "integrity": "sha512-u/KgA7s2zAtZ7gZvL13HZbO3mZATvjfCLU8Ez6h8VweG8UsIBVaPfYziMDCmJOWIPYLGzEW8eG/u4mCHuyLBow==", + "dev": true, + "requires": { + "@pushrocks/lik": "^4.0.20", + "@pushrocks/smartdelay": "^2.0.3" + } + }, "@pushrocks/smartexpect": { "version": "1.0.12", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexpect/-/smartexpect-1.0.12.tgz", @@ -2297,6 +2297,20 @@ } } }, + "@pushrocks/smartshell": { + "version": "2.0.30", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartshell/-/smartshell-2.0.30.tgz", + "integrity": "sha512-HPgdTFzfzhk2TQau/jVdYNSANlxyBZdqq2vyZ+bZahegVHfH/27Zur5Fk+2vE16VJjJMqP7zcvDITUe2+ipgJg==", + "dev": true, + "requires": { + "@pushrocks/smartdelay": "^2.0.13", + "@pushrocks/smartexit": "^1.0.20", + "@pushrocks/smartpromise": "^3.1.6", + "@types/which": "^2.0.1", + "tree-kill": "^1.2.2", + "which": "^2.0.2" + } + }, "@pushrocks/smarttime": { "version": "3.0.45", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarttime/-/smarttime-3.0.45.tgz", @@ -2428,6 +2442,12 @@ "@types/node": "*" } }, + "@types/which": { + "version": "2.0.1", + "resolved": "https://verdaccio.lossless.one/@types%2fwhich/-/which-2.0.1.tgz", + "integrity": "sha512-Jjakcv8Roqtio6w1gr0D7y6twbhx6gGgFGF5BLwajPpnOIOxFkakFhCq+LmyyeAz7BX6ULrjBOxdKaCDy+4+dQ==", + "dev": true + }, "@types/yargs": { "version": "16.0.4", "resolved": "https://verdaccio.lossless.one/@types%2fyargs/-/yargs-16.0.4.tgz", @@ -2821,6 +2841,12 @@ "resolved": "https://verdaccio.lossless.one/is-promise/-/is-promise-2.2.2.tgz", "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==" }, + "isexe": { + "version": "2.0.0", + "resolved": "https://verdaccio.lossless.one/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, "js-tokens": { "version": "4.0.0", "resolved": "https://verdaccio.lossless.one/js-tokens/-/js-tokens-4.0.0.tgz", @@ -3053,6 +3079,12 @@ "readable-stream": "3" } }, + "tree-kill": { + "version": "1.2.2", + "resolved": "https://verdaccio.lossless.one/tree-kill/-/tree-kill-1.2.2.tgz", + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", + "dev": true + }, "tslib": { "version": "1.13.0", "resolved": "https://verdaccio.lossless.one/tslib/-/tslib-1.13.0.tgz", @@ -3117,6 +3149,15 @@ "integrity": "sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==", "dev": true }, + "which": { + "version": "2.0.2", + "resolved": "https://verdaccio.lossless.one/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, "wrap-ansi": { "version": "7.0.0", "resolved": "https://verdaccio.lossless.one/wrap-ansi/-/wrap-ansi-7.0.0.tgz", diff --git a/package.json b/package.json index 2f131a9..406624f 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "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" }, @@ -36,7 +37,7 @@ "typescript": "4.7.0-dev.20220311" }, "devDependencies": { - "@gitzone/tsrun": "1.2.18", + "@gitzone/tsrun": "^1.2.24", "@pushrocks/tapbundle": "^4.0.8", "@types/node": "^17.0.21", "tslint": "^6.1.3", diff --git a/test/assets/output/tocompile.js b/test/assets/output/tocompile.js index 90549e1..872ef6d 100644 --- a/test/assets/output/tocompile.js +++ b/test/assets/output/tocompile.js @@ -3,7 +3,7 @@ console.log('test2'); import * as early from '@pushrocks/early'; early.start(); early.stop(); -import { anExportedString } from './tocompile2'; +import { anExportedString } from './tocompile2.js'; console.log(anExportedString); class test2 { constructor() { @@ -14,4 +14,4 @@ class test2 { const run = async () => { return 'hi'; }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9jb21waWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdG9jb21waWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUVyQixPQUFPLEtBQUssS0FBSyxNQUFNLGtCQUFrQixDQUFDO0FBRTFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUNkLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQztBQUViLE9BQU8sRUFBQyxnQkFBZ0IsRUFBQyxNQUFNLGNBQWMsQ0FBQztBQUM5QyxPQUFPLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLENBQUM7QUFFOUIsTUFBTSxLQUFLO0lBRVQ7UUFEQSxTQUFJLEdBQWEsRUFBRSxDQUFDO1FBRWxCLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDcEIsQ0FBQztDQUNGO0FBRUQsTUFBTSxHQUFHLEdBQUcsS0FBSyxJQUFxQixFQUFFO0lBQ3RDLE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQyxDQUFDIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9jb21waWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdG9jb21waWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUVyQixPQUFPLEtBQUssS0FBSyxNQUFNLGtCQUFrQixDQUFDO0FBRTFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUNkLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQztBQUViLE9BQU8sRUFBQyxnQkFBZ0IsRUFBQyxNQUFNLGlCQUFpQixDQUFDO0FBQ2pELE9BQU8sQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztBQUU5QixNQUFNLEtBQUs7SUFFVDtRQURBLFNBQUksR0FBYSxFQUFFLENBQUM7UUFFbEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNwQixDQUFDO0NBQ0Y7QUFFRCxNQUFNLEdBQUcsR0FBRyxLQUFLLElBQXFCLEVBQUU7SUFDdEMsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDLENBQUMifQ== \ No newline at end of file diff --git a/test/assets/tocompile.ts b/test/assets/tocompile.ts index 232adf9..409b24c 100644 --- a/test/assets/tocompile.ts +++ b/test/assets/tocompile.ts @@ -6,7 +6,7 @@ import * as early from '@pushrocks/early'; early.start(); early.stop(); -import {anExportedString} from './tocompile2'; +import {anExportedString} from './tocompile2.js'; console.log(anExportedString); class test2 { diff --git a/test/test.ts b/test/test.ts index 507006a..756a9a6 100644 --- a/test/test.ts +++ b/test/test.ts @@ -1,6 +1,6 @@ import { tap, expect, expectAsync } from '@pushrocks/tapbundle'; -import * as tsbuild from '../ts/index'; +import * as tsbuild from '../ts/index.js'; let assetfiles: string[] = ['./test/assets/tocompile.ts', './test/assets/tocompile2.ts']; diff --git a/ts/index.ts b/ts/index.ts index 818c916..3cfdfba 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'; -export * from './tsbuild.cli'; +export * from './tsbuild.exports.js'; +export * from './tsbuild.cli.js'; early.stop(); \ No newline at end of file diff --git a/ts/tsbuild.classes.compiler.ts b/ts/tsbuild.classes.compiler.ts index ae9f81f..5c5f173 100644 --- a/ts/tsbuild.classes.compiler.ts +++ b/ts/tsbuild.classes.compiler.ts @@ -1,7 +1,7 @@ // import all the stuff we need -import * as plugins from './tsbuild.plugins'; -import { CompilerOptions } from 'typescript'; -export { CompilerOptions, ScriptTarget, ModuleKind } from 'typescript'; +import * as plugins from './tsbuild.plugins.js'; +import { CompilerOptions, ScriptTarget, ModuleKind } from 'typescript'; + /** * the default typescript compilerOptions @@ -13,12 +13,12 @@ export const compilerOptionsDefault: CompilerOptions = { inlineSourceMap: true, noEmitOnError: true, outDir: 'dist_ts/', - module: plugins.typescript.ModuleKind.CommonJS, + module: plugins.typescript.ModuleKind.ES2020, + target: plugins.typescript.ScriptTarget.ES2020, moduleResolution: plugins.typescript.ModuleResolutionKind.Node12, lib: [], noImplicitAny: false, esModuleInterop: true, - target: plugins.typescript.ScriptTarget.ES2020, importsNotUsedAsValues: plugins.typescript.ImportsNotUsedAsValues.Preserve }; diff --git a/ts/tsbuild.cli.ts b/ts/tsbuild.cli.ts index d98be4c..8f53b7e 100644 --- a/ts/tsbuild.cli.ts +++ b/ts/tsbuild.cli.ts @@ -1,5 +1,5 @@ -import * as plugins from './tsbuild.plugins'; -import * as tsbuild from './tsbuild.exports'; +import * as plugins from './tsbuild.plugins.js'; +import * as tsbuild from './tsbuild.exports.js'; export const runCli = async () => { const tsbuildCli = new plugins.smartcli.Smartcli(); diff --git a/ts/tsbuild.exports.ts b/ts/tsbuild.exports.ts index 4e54ffd..a061bc3 100644 --- a/ts/tsbuild.exports.ts +++ b/ts/tsbuild.exports.ts @@ -1,7 +1,8 @@ -import * as plugins from './tsbuild.plugins'; -import { compiler, CompilerOptions, mergeCompilerOptions } from './tsbuild.classes.compiler'; +import * as plugins from './tsbuild.plugins.js'; +import { CompilerOptions } from 'typescript'; +import { compiler, mergeCompilerOptions } from './tsbuild.classes.compiler.js'; -export * from './tsbuild.classes.compiler'; +export * from './tsbuild.classes.compiler.js'; /** * compile am array of absolute file paths