Compare commits

..

10 Commits

Author SHA1 Message Date
dda03bad45 2.1.57 2022-03-18 14:31:48 +01:00
a0b9f8d8f3 fix(core): update 2022-03-18 14:31:48 +01:00
da823e51d5 2.1.56 2022-03-15 20:06:48 +01:00
b68aa06941 fix(core): update 2022-03-15 20:06:48 +01:00
f5ee2c2c70 2.1.55 2022-03-15 10:21:15 +01:00
0c018e6448 fix(core): update 2022-03-15 10:21:15 +01:00
565c66e4e6 2.1.54 2022-03-15 10:18:09 +01:00
72ad77446c fix(core): update 2022-03-15 10:18:08 +01:00
59ce28395f 2.1.53 2022-03-15 10:04:59 +01:00
cddd7ffd25 fix(core): update 2022-03-15 10:04:59 +01:00
5 changed files with 20 additions and 22 deletions

5
package-lock.json generated
View File

@ -1,16 +1,17 @@
{ {
"name": "@gitzone/tsbuild", "name": "@gitzone/tsbuild",
"version": "2.1.52", "version": "2.1.57",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@gitzone/tsbuild", "name": "@gitzone/tsbuild",
"version": "2.1.52", "version": "2.1.57",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@pushrocks/early": "^3.0.6", "@pushrocks/early": "^3.0.6",
"@pushrocks/smartcli": "^3.0.14", "@pushrocks/smartcli": "^3.0.14",
"@pushrocks/smartdelay": "^2.0.13",
"@pushrocks/smartfile": "^9.0.6", "@pushrocks/smartfile": "^9.0.6",
"@pushrocks/smartlog": "^2.0.44", "@pushrocks/smartlog": "^2.0.44",
"@pushrocks/smartpath": "^5.0.4", "@pushrocks/smartpath": "^5.0.4",

View File

@ -1,6 +1,6 @@
{ {
"name": "@gitzone/tsbuild", "name": "@gitzone/tsbuild",
"version": "2.1.52", "version": "2.1.57",
"private": false, "private": false,
"description": "TypeScript nightly to easily make use of latest features", "description": "TypeScript nightly to easily make use of latest features",
"main": "dist_ts/index.js", "main": "dist_ts/index.js",
@ -30,6 +30,7 @@
"dependencies": { "dependencies": {
"@pushrocks/early": "^3.0.6", "@pushrocks/early": "^3.0.6",
"@pushrocks/smartcli": "^3.0.14", "@pushrocks/smartcli": "^3.0.14",
"@pushrocks/smartdelay": "^2.0.13",
"@pushrocks/smartfile": "^9.0.6", "@pushrocks/smartfile": "^9.0.6",
"@pushrocks/smartlog": "^2.0.44", "@pushrocks/smartlog": "^2.0.44",
"@pushrocks/smartpath": "^5.0.4", "@pushrocks/smartpath": "^5.0.4",

View File

@ -16,17 +16,12 @@ export const compilerOptionsDefault: CompilerOptions = {
module: plugins.typescript.ModuleKind.ES2020, module: plugins.typescript.ModuleKind.ES2020,
target: plugins.typescript.ScriptTarget.ES2020, target: plugins.typescript.ScriptTarget.ES2020,
moduleResolution: plugins.typescript.ModuleResolutionKind.Node12, moduleResolution: plugins.typescript.ModuleResolutionKind.Node12,
lib: [], lib: ['lib.dom.d.ts'],
noImplicitAny: true, noImplicitAny: true,
esModuleInterop: true, esModuleInterop: true,
importsNotUsedAsValues: plugins.typescript.ImportsNotUsedAsValues.Preserve importsNotUsedAsValues: plugins.typescript.ImportsNotUsedAsValues.Preserve
}; };
export const compilerOptionsWebDefault: CompilerOptions = {
...compilerOptionsDefault,
lib: [...compilerOptionsDefault.lib, 'lib.dom.d.ts']
};
/** /**
* merges compilerOptions with the default compiler options * merges compilerOptions with the default compiler options
*/ */
@ -34,17 +29,9 @@ export const mergeCompilerOptions = (
customTsOptions: CompilerOptions, customTsOptions: CompilerOptions,
argvArg?: any argvArg?: any
): CompilerOptions => { ): CompilerOptions => {
const defaultOptionsToMerge = (() => {
if (argvArg && argvArg.web) {
return compilerOptionsWebDefault;
} else {
return compilerOptionsDefault;
}
})();
// create merged options // create merged options
const mergedOptions: CompilerOptions = { const mergedOptions: CompilerOptions = {
...defaultOptionsToMerge, ...compilerOptionsDefault,
...customTsOptions, ...customTsOptions,
...argvArg && argvArg.skiplibcheck ? { ...argvArg && argvArg.skiplibcheck ? {
skipLibCheck: true skipLibCheck: true
@ -54,21 +41,29 @@ export const mergeCompilerOptions = (
} : {}, } : {},
...argvArg && argvArg.commonjs ? { ...argvArg && argvArg.commonjs ? {
module: plugins.typescript.ModuleKind.CommonJS, module: plugins.typescript.ModuleKind.CommonJS,
moduleResolution: plugins.typescript.ModuleResolutionKind.Classic, moduleResolution: plugins.typescript.ModuleResolutionKind.NodeJs,
} : {}, } : {},
}; };
console.log(mergedOptions)
return mergedOptions; return mergedOptions;
}; };
/** /**
* the internal main compiler function that compiles the files * the internal main compiler function that compiles the files
*/ */
export const compiler = ( export const compiler = async (
fileNames: string[], fileNames: string[],
options: plugins.typescript.CompilerOptions, options: plugins.typescript.CompilerOptions,
argvArg?: any argvArg?: any
): Promise<any[]> => { ): Promise<any[]> => {
if (options.skipLibCheck) {
console.log('? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?')
console.log('You are skipping libcheck... Is that really wanted?');
console.log('? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?')
await plugins.smartdelay.delayFor(5000);
}
console.log(`Compiling ${fileNames.length} files...`); console.log(`Compiling ${fileNames.length} files...`);
const done = plugins.smartpromise.defer<any[]>(); const done = plugins.smartpromise.defer<any[]>();
const program = plugins.typescript.createProgram(fileNames, options); const program = plugins.typescript.createProgram(fileNames, options);

View File

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

View File

@ -1,7 +1,8 @@
import * as smartcli from '@pushrocks/smartcli'; import * as smartcli from '@pushrocks/smartcli';
import * as smartdelay from '@pushrocks/smartdelay';
import * as smartfile from '@pushrocks/smartfile'; import * as smartfile from '@pushrocks/smartfile';
import * as smartpath from '@pushrocks/smartpath'; import * as smartpath from '@pushrocks/smartpath';
import * as smartpromise from '@pushrocks/smartpromise'; import * as smartpromise from '@pushrocks/smartpromise';
import typescript from 'typescript'; import typescript from 'typescript';
export { smartcli, smartfile, smartpath, smartpromise, typescript }; export { smartcli, smartdelay, smartfile, smartpath, smartpromise, typescript };