2.1.56

cli.child.ts

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+process.env.CLI_CALL = 'true';
+import * as cliTool from './ts/index.js';
+cliTool.runCli();

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();

cli.ts.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
-require('@gitzone/tsrun');
-const cliTool = require('./ts/index');
-cliTool.runCli();
+import * as tsrun from '@gitzone/tsrun';
+tsrun.runPath('./cli.child.js');

package.json

@@ -1,17 +1,18 @@
 {
   "name": "@gitzone/tsbuild",
-  "version": "2.1.40",
+  "version": "2.1.56",
   "private": false,
   "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"
   },
   "scripts": {
     "test": "tsrun test/test.ts",
     "testCustom": "node cli.ts.js custom ts_web",
-    "build": "node cli.ts.js --web"
+    "build": "node cli.ts.js --web --allowimplicitany"
   },
   "repository": {
     "type": "git",
@@ -31,16 +32,14 @@
     "@pushrocks/smartcli": "^3.0.14",
     "@pushrocks/smartfile": "^9.0.6",
     "@pushrocks/smartlog": "^2.0.44",
-    "@pushrocks/smartpath": "^4.0.3",
+    "@pushrocks/smartpath": "^5.0.4",
     "@pushrocks/smartpromise": "^3.1.7",
-    "typescript": "4.7.0-dev.20220311"
+    "typescript": "4.7.0"
   },
   "devDependencies": {
-    "@gitzone/tsrun": "1.2.18",
-    "@pushrocks/tapbundle": "^4.0.8",
-    "@types/node": "^17.0.21",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0"
+    "@gitzone/tsrun": "^1.2.31",
+    "@pushrocks/tapbundle": "^5.0.2",
+    "@types/node": "^17.0.21"
   },
   "files": [
     "ts/**/*",

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=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9jb21waWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdG9jb21waWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUVyQixPQUFPLEtBQUssS0FBSyxNQUFNLGtCQUFrQixDQUFDO0FBRTFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUNkLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQztBQUViLE9BQU8sRUFBQyxnQkFBZ0IsRUFBQyxNQUFNLGlCQUFpQixDQUFDO0FBQ2pELE9BQU8sQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztBQUU5QixNQUFNLEtBQUs7SUFFVDtRQURBLFNBQUksR0FBYSxFQUFFLENBQUM7UUFFbEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNwQixDQUFDO0NBQ0Y7QUFFRCxNQUFNLEdBQUcsR0FBRyxLQUFLLElBQXFCLEVBQUU7SUFDdEMsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDLENBQUMifQ==

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 {

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'];
 

ts/index.ts

@@ -1,5 +1,5 @@
 import * as early from '@pushrocks/early';
 early.start('tsbuild');
-export * from './tsbuild.exports';
-export * from './tsbuild.cli';
-early.stop();
+export * from './tsbuild.exports.js';
+export * from './tsbuild.cli.js';
+early.stop();

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 './tsbuild.exports.js';
+
 
 /**
  * the default typescript compilerOptions
@@ -13,20 +13,15 @@ export const compilerOptionsDefault: CompilerOptions = {
   inlineSourceMap: true,
   noEmitOnError: true,
   outDir: 'dist_ts/',
-  module: plugins.typescript.ModuleKind.CommonJS,
-  moduleResolution: plugins.typescript.ModuleResolutionKind.Node12,
-  lib: [],
-  noImplicitAny: false,
-  esModuleInterop: true,
+  module: plugins.typescript.ModuleKind.ES2020,
   target: plugins.typescript.ScriptTarget.ES2020,
+  moduleResolution: plugins.typescript.ModuleResolutionKind.Node12,
+  lib: ['lib.dom.d.ts'],
+  noImplicitAny: true,
+  esModuleInterop: true,
   importsNotUsedAsValues: plugins.typescript.ImportsNotUsedAsValues.Preserve
 };
 
-export const compilerOptionsWebDefault: CompilerOptions = {
-  ...compilerOptionsDefault,
-  lib: [...compilerOptionsDefault.lib, 'lib.dom.d.ts']
-};
-
 /**
  * merges compilerOptions with the default compiler options
  */
@@ -34,23 +29,24 @@ export const mergeCompilerOptions = (
   customTsOptions: CompilerOptions,
   argvArg?: any
 ): CompilerOptions => {
-  const defaultOptionsToMerge = (() => {
-    if (argvArg && argvArg.web) {
-      return compilerOptionsWebDefault;
-    } else {
-      return compilerOptionsDefault;
-    }
-  })();
-
   // create merged options
   const mergedOptions: CompilerOptions = {
-    ...defaultOptionsToMerge,
+    ...compilerOptionsDefault,
     ...customTsOptions,
     ...argvArg && argvArg.skiplibcheck ? {
       skipLibCheck: true
     } : {},
+    ...argvArg && argvArg.allowimplicitany ? {
+      noImplicitAny: false
+    } : {},
+    ...argvArg && argvArg.commonjs ? {
+      module: plugins.typescript.ModuleKind.CommonJS,
+      moduleResolution: plugins.typescript.ModuleResolutionKind.NodeJs,
+    } : {},
   };
 
+  console.log(mergedOptions)
+
   return mergedOptions;
 };
 

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();
@@ -38,7 +38,7 @@ export const runCli = async () => {
       },
       {},
       process.cwd(),
-      { web: true }
+      { web: true, ...argvArg },
     );
   });
 

ts/tsbuild.exports.ts

@@ -1,7 +1,14 @@
-import * as plugins from './tsbuild.plugins';
-import { compiler, CompilerOptions, mergeCompilerOptions } from './tsbuild.classes.compiler';
+import * as plugins from './tsbuild.plugins.js';
+import type { CompilerOptions, ScriptTarget, ModuleKind } from 'typescript';
+import { compiler, mergeCompilerOptions } from './tsbuild.classes.compiler.js';
 
-export * from './tsbuild.classes.compiler';
+export type {
+  CompilerOptions,
+  ScriptTarget,
+  ModuleKind
+}
+
+export * from './tsbuild.classes.compiler.js';
 
 /**
  * compile am array of absolute file paths

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}