1.0.104

.gitlab-ci.yml

@@ -12,6 +12,9 @@ stages:
   - release
   - metadata
 
+before_script:
+  - npm install -g @shipzone/npmci
+
 # ====================
 # security stage
 # ====================

.snyk

@@ -1,4 +0,0 @@
-# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.13.5
-ignore: {}
-patch: {}

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
-      "type": "node",
+      "command": "npm test",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
-        "${relativeFile}"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
-    },
-    {
-      "name": "test.ts",
-      "type": "node",
-      "request": "launch",
-      "args": [
-        "test/test.ts"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
+      "type": "node-terminal"
     }
   ]
 }

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

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,5 @@
 #!/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', import.meta.url);

npmextra.json

@@ -5,7 +5,7 @@
       "githost": "gitlab.com",
       "gitscope": "gitzone",
       "gitrepo": "tsbundle",
-      "shortDescription": "a bundler using rollup for painless bundling of web projects",
+      "description": "a bundler using rollup for painless bundling of web projects",
       "npmPackagename": "@gitzone/tsbundle",
       "license": "MIT",
       "projectDomain": "git.zone"

package.json

@@ -1,54 +1,40 @@
 {
   "name": "@gitzone/tsbundle",
-  "version": "1.0.89",
+  "version": "1.0.104",
   "private": false,
   "description": "a bundler using rollup for painless bundling of web projects",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
     "test": "npm run build && (tstest test/) && (cd test && node ../cli.js --production)",
-    "build": "(tsbuild --web)"
+    "build": "(tsbuild --web --allowimplicitany)"
   },
   "bin": {
     "tsbundle": "cli.js"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.29",
-    "@gitzone/tsrun": "^1.2.18",
-    "@gitzone/tstest": "^1.0.60",
-    "@pushrocks/tapbundle": "^4.0.0",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.15.0"
+    "@gitzone/tsbuild": "^2.1.59",
+    "@gitzone/tsrun": "^1.2.31",
+    "@gitzone/tstest": "^1.0.69",
+    "@pushrocks/tapbundle": "^5.0.2"
   },
   "dependencies": {
-    "@babel/core": "^7.16.12",
-    "@babel/plugin-proposal-class-properties": "^7.16.7",
-    "@babel/plugin-proposal-decorators": "^7.16.7",
-    "@babel/plugin-transform-runtime": "^7.16.10",
-    "@babel/preset-env": "^7.16.11",
-    "@babel/runtime": "^7.16.7",
     "@pushrocks/early": "^3.0.6",
     "@pushrocks/smartcli": "^3.0.14",
-    "@pushrocks/smartfile": "^9.0.5",
+    "@pushrocks/smartfile": "^9.0.6",
     "@pushrocks/smartlog": "^2.0.44",
     "@pushrocks/smartlog-destination-local": "^8.0.8",
-    "@pushrocks/smartparcel": "^1.0.9",
-    "@pushrocks/smartpromise": "^3.1.6",
+    "@pushrocks/smartpath": "^5.0.5",
+    "@pushrocks/smartpromise": "^3.1.7",
     "@pushrocks/smartspawn": "^2.0.9",
-    "@rollup/plugin-commonjs": "^21.0.1",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.1.3",
-    "@rollup/plugin-typescript": "^8.3.0",
     "@types/html-minifier": "^4.0.2",
-    "@types/node": "^17.0.10",
+    "@types/node": "^17.0.21",
+    "esbuild": "0.14.27",
     "html-minifier": "^4.0.0",
-    "rollup": "^2.66.0",
-    "rollup-plugin-babel": "^4.4.0",
-    "rollup-plugin-sourcemaps": "^0.6.3",
-    "rollup-plugin-terser": "^7.0.2",
-    "typescript": "^4.5.5"
+    "typescript": "4.7.0"
   },
   "files": [
     "ts/**/*",
@@ -61,5 +47,8 @@
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -8,13 +8,20 @@ a bundler using rollup for painless bundling of web projects
 * [docs (typedoc)](https://gitzone.gitlab.io/tsbundle/)
 
 ## Status for master
-[![pipeline status](https://gitlab.com/gitzone/tsbundle/badges/master/pipeline.svg)](https://gitlab.com/gitzone/tsbundle/commits/master)
-[![coverage report](https://gitlab.com/gitzone/tsbundle/badges/master/coverage.svg)](https://gitlab.com/gitzone/tsbundle/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/@gitzone/tsbundle.svg)](https://www.npmjs.com/package/@gitzone/tsbundle)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@gitzone/tsbundle/badge.svg)](https://snyk.io/test/npm/@gitzone/tsbundle)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/gitzone/tsbundle/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/gitzone/tsbundle/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@gitzone/tsbundle)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/gitzone/tsbundle)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@gitzone/tsbundle)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@gitzone/tsbundle)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@gitzone/tsbundle)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
@@ -44,6 +51,7 @@ tsbundle --from="./ts/index.ts" --to="dist/bundle.js"
 ```
 
 ## API
+
 You are using TypeScript, aren't you? Most of the stuff is apparent from the IDE intellisense.
 
 ```typescript
@@ -52,10 +60,10 @@ import { TsBundle } from '@gitozne/tsbundle';
 const myTsBundleInstance = new TsBundle();
 
 const run = async () => {
-  await myTsBundleInstance.buildTest('./from/my.ts', './to/mybundle.js')
+  await myTsBundleInstance.buildTest('./from/my.ts', './to/mybundle.js');
   // OR
-  await myTsBundleInstance.buildProduction('./from/my.ts', './to/mybundle.js')
-}
+  await myTsBundleInstance.buildProduction('./from/my.ts', './to/mybundle.js');
+};
 ```
 
 ## Contribution

rollup.config.js

@@ -1,57 +0,0 @@
-import resolve from 'rollup-plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
-import sourceMaps from 'rollup-plugin-sourcemaps';
-import typescript from 'rollup-plugin-typescript2';
-import json from 'rollup-plugin-json';
-import babel from 'rollup-plugin-babel';
-
-const pkg = require('./package.json');
-
-export default {
-  input: `ts_web/index.ts`,
-  output: {
-    name: 'tsbundle',
-    // file: 'dist_web/bundle.js',
-    file: 'dist_web/bundle.js',
-    format: 'iife',
-    sourcemap: true
-  },
-  // Indicate here external modules you don't wanna include in your bundle (i.e.: 'lodash')
-  external: [],
-  watch: {
-    include: 'src/**'
-  },
-  plugins: [
-    // Allow json resolution
-    json(),
-    // Compile TypeScript files
-    typescript({ useTsconfigDeclarationDir: true, tsconfigOverride: {
-      compilerOptions: {
-        declaration: true,
-        emitDecoratorMetadata: true,
-        experimentalDecorators: true,
-        inlineSourceMap: true,
-        noEmitOnError: true,
-        lib: ['es2016', 'es2017', 'dom'],
-        noImplicitAny: false
-      }
-    } }),
-    // Allow node_modules resolution, so you can use 'external' to control
-    // which external modules to include in the bundle
-    // https://github.com/rollup/rollup-plugin-node-resolve#usage
-    resolve(),
-    commonjs({
-      namedExports: {
-          'node_modules/@pushrocks/smartstate/dist/index.js': ['Smartstate']
-      }
-    }),
-
-    // Resolve source maps to the original source
-    sourceMaps(),
-    babel({
-      extensions: ['.js', '.jsx', '.ts', '.tsx'],
-      babelrc: false,
-      presets: [["@babel/preset-env", { modules: false }]]
-    })
-  ]
-};

test/test.ts

@@ -1,16 +1,17 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import * as tsbundle from '../dist_ts/index';
+import * as tsbundle from '../ts/index.js';
 
-import * as path from 'path';
-
-tap.test('should bundle test', async () => {
+tap.test('should bundle with esbuild', async () => {
   const tsbundleInstance = new tsbundle.TsBundle();
-  await tsbundleInstance.buildTest(process.cwd() + '/test', './ts_web/index.ts', './dist_manual/test.js', 'rollup')
-})
+  await tsbundleInstance.build(
+    process.cwd() + '/test',
+    './ts_web/index.ts',
+    './dist_manual/test.js',
+    {
+      bundler: 'esbuild'
+    }
+  );
+});
 
-tap.test('should bundle production', async () => {
-  const tsbundleInstance = new tsbundle.TsBundle();
-  await tsbundleInstance.buildProduction(process.cwd(), './test/ts_web/index.ts', './test/dist_manual/production.js')
-})
 
 tap.start();

test/ts_web/index.ts

@@ -7,7 +7,7 @@ function sealed(constructor: Function) {
 
 @sealed
 class BugReport {
-  type = "report";
+  type = 'report';
   title: string;
 
   constructor(t: string) {

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@gitzone/tsbundle',
+  version: '1.0.104',
+  description: 'a bundler using rollup for painless bundling of web projects'
+}

ts/index.ts

@@ -1,13 +1,13 @@
 import * as early from '@pushrocks/early';
 early.start('tsbundle');
 // lets import all plugins beforehand
-import './tsbundle.plugins';
+import './plugins.js';
 
-import { logger } from './tsbundle.logging';
-import { runCli } from './tsbundle.cli';
+import { logger } from './tsbundle.logging.js';
+import { runCli } from './tsbundle.cli.js';
 early.stop();
 
 // lets make this usable programmatically
-export * from './tsbundle.class.tsbundle';
-export * from './tsbundle.htmlhandler';
+export * from './tsbundle.class.tsbundle.js';
+export * from './mod_html/index.js';
 export { runCli };

ts/interfaces/index.ts

@@ -0,0 +1,14 @@
+export interface ICliOptions {
+  commonjs?: boolean;
+  skiplibcheck?: boolean;
+  production?: boolean;
+  bundler: 'parcel' | 'esbuild' | 'rollup'
+}
+
+export interface IEnvTransportOptions {
+  cwd: string;
+  from: string;
+  to: string;
+  mode: 'test' | 'production',
+  argv: ICliOptions
+}

ts/mod_esbuild/index.child.ts

@@ -0,0 +1,81 @@
+import * as plugins from './plugins.js';
+import * as paths from '../paths.js';
+import * as interfaces from '../interfaces/index.js';
+import { logger } from '../tsbundle.logging.js';
+
+export class TsBundleProcess {
+
+  constructor() {
+    // Nothing here
+  }
+
+  /**
+   * creates a bundle for the test enviroment
+   */
+  public async buildTest(
+    fromArg: string,
+    toArg: string,
+    argvArg: any
+  ) {
+    // create a bundle
+    const esbuild = await plugins.esbuild.build({
+      entryPoints: [fromArg],
+      bundle: true,
+      sourcemap: true,
+      format: 'esm',
+      target: 'es2020',
+      outfile: toArg,
+      tsconfig: paths.tsconfigPath
+    });
+  }
+
+  /**
+   * creates a bundle for the production environment
+   */
+  public async buildProduction(
+    fromArg: string,
+    toArg: string,
+    argvArg: any
+  ) {
+    // create a bundle
+    console.log('esbuild specific:');
+    console.log(`from: ${fromArg}`);
+    console.log((`to: ${toArg}`));
+    const esbuild = await plugins.esbuild.build({
+      entryPoints: [fromArg],
+      bundle: true,
+      sourcemap: true,
+      format: 'esm',
+      target: 'es2020',
+      minify: true,
+      outfile: toArg
+    });
+  }
+}
+
+const run = async () => {
+  console.log('running spawned compilation process');
+  const transportOptions: interfaces.IEnvTransportOptions = JSON.parse(process.env.transportOptions);
+  console.log('=======> ESBUILD');
+  console.log(transportOptions);
+  process.chdir(transportOptions.cwd);
+  console.log(`switched to ${process.cwd()}`);
+  const tsbundleProcessInstance = new TsBundleProcess();
+  if (transportOptions.mode === 'test') {
+    console.log('building for test:')
+    tsbundleProcessInstance.buildTest(
+      plugins.smartpath.transform.makeAbsolute(transportOptions.from, process.cwd()),
+      plugins.smartpath.transform.makeAbsolute(transportOptions.to, process.cwd()),
+      transportOptions.argv
+    );
+  } else {
+    console.log('building for production:')
+    tsbundleProcessInstance.buildProduction(
+      plugins.smartpath.transform.makeAbsolute(transportOptions.from, process.cwd()),
+      plugins.smartpath.transform.makeAbsolute(transportOptions.to, process.cwd()),
+      transportOptions.argv
+    );
+  }
+};
+
+run();

ts/mod_esbuild/plugins.ts

@@ -0,0 +1,7 @@
+export * from '../plugins.js';
+
+import esbuild from 'esbuild';
+
+export {
+  esbuild
+}

ts/mod_html/index.ts

@@ -0,0 +1,44 @@
+import * as plugins from './plugins.js';
+import * as paths from '../paths.js';
+
+export class HtmlHandler {
+  public defaultFromPath: string = plugins.path.join(paths.htmlDir, 'index.html');
+  public defaultToPath: string = plugins.path.join(paths.distServeDir, 'index.html');
+
+  public async checkIfExists() {
+    return plugins.smartfile.fs.fileExists(this.defaultFromPath);
+  }
+
+  // copies the html
+  public async copyHtml(fromArg: string = this.defaultFromPath, toArg: string = this.defaultToPath) {
+    if (await this.checkIfExists()) {
+      console.log(`${fromArg} replaces file at ${toArg}`);
+    }
+    fromArg = plugins.smartpath.transform.toAbsolute(fromArg, paths.cwd) as string;
+    toArg = plugins.smartpath.transform.toAbsolute(toArg, paths.cwd) as string;
+    await plugins.smartfile.fs.copy(fromArg, toArg);
+    console.log(`html copy succeeded!`);
+  }
+
+  // copies and minifies the html
+  public async minifyHtml(fromArg: string = this.defaultFromPath, toArg: string = this.defaultToPath) {
+    if (await this.checkIfExists()) {
+      console.log(`${fromArg} replaces file at ${toArg}`);
+    }
+    fromArg = plugins.smartpath.transform.toAbsolute(fromArg, paths.cwd) as string;
+    toArg = plugins.smartpath.transform.toAbsolute(toArg, paths.cwd) as string;
+    const fileString = plugins.smartfile.fs.toStringSync(fromArg);
+    const minifiedHtml = plugins.htmlMinifier.minify(fileString, {
+      minifyCSS: true,
+      minifyJS: true,
+      sortAttributes: true,
+      sortClassName: true,
+      removeAttributeQuotes: true,
+      collapseWhitespace: true,
+      collapseInlineTagWhitespace: true,
+      removeComments: true,
+    });
+    await plugins.smartfile.memory.toFs(minifiedHtml, toArg);
+    console.log(`html minification succeeded!`);
+  }
+}

ts/mod_html/plugins.ts

@@ -0,0 +1,7 @@
+export * from '../plugins.js';
+
+import * as htmlMinifier from 'html-minifier';
+
+export {
+  htmlMinifier
+}

ts/paths.ts

@@ -0,0 +1,11 @@
+import * as plugins from './plugins.js';
+
+export const cwd = process.cwd();
+export const packageDir = plugins.path.join(
+  plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),
+  '../'
+);
+export const htmlDir = plugins.path.join(cwd, './html');
+export const distServeDir = plugins.path.join(cwd, './dist_serve');
+export const assetsDir = plugins.path.join(packageDir, 'assets');
+export const tsconfigPath = plugins.path.join(packageDir, './tsconfig.json');

ts/plugins.ts

@@ -0,0 +1,23 @@
+// node native
+import * as path from 'path';
+
+export { path };
+
+// pushrocks scope
+import * as smartcli from '@pushrocks/smartcli';
+import * as smartfile from '@pushrocks/smartfile';
+import * as smartlog from '@pushrocks/smartlog';
+import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
+import * as smartpath from '@pushrocks/smartpath';
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartspawn from '@pushrocks/smartspawn';
+
+export {
+  smartcli,
+  smartfile,
+  smartlog,
+  smartlogDestinationLocal,
+  smartpath,
+  smartpromise,
+  smartspawn,
+};

ts/tsbundle.class.tsbundle.ts

@@ -1,41 +1,49 @@
-import * as plugins from './tsbundle.plugins';
-import { logger } from './tsbundle.logging';
+import * as plugins from './plugins.js';
+import * as interfaces from './interfaces/index.js';
+import { logger } from './tsbundle.logging.js';
 
 export class TsBundle {
-  public async buildTest(cwdArg: string, fromArg: string, toArg: string, bundlerArg: 'rollup' | 'parcel') {
+
+  public async build(
+    cwdArg: string,
+    fromArg: string = './ts_web/index.ts',
+    toArg: string = './dist_bundle/bundle.js',
+    argvArg: interfaces.ICliOptions
+  ) {
     const done = plugins.smartpromise.defer();
-    const threadsimple = new plugins.smartspawn.ThreadSimple(plugins.path.join(__dirname, './tsbundle.class.tsbundleprocess.js'), [], {
-      env: {
-        ...process.env,
-        tsbundleMode: 'test',
-        tsbundleCwd: cwdArg,
-        tsbundleFrom: fromArg,
-        tsbundleTo: toArg,
-        tsbundleBundler: bundlerArg
+    const getBundlerPath = () => {
+      if (argvArg.bundler === 'esbuild') {
+        return './mod_esbuild/index.child.js'
       }
-    })
+      return './mod_esbuild/index.child.js'
+    }
+    const transportOptions: interfaces.IEnvTransportOptions = {
+      cwd: cwdArg,
+      from: fromArg,
+      to: toArg,
+      mode: argvArg && argvArg.production ? 'production' : 'test',
+      argv:  {
+        bundler: 'esbuild',
+        ...argvArg
+      } 
+    }
+    const threadsimple = new plugins.smartspawn.ThreadSimple(
+      plugins.path.join(
+        plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),
+        getBundlerPath()
+      ),
+      [],
+      {
+        env: {
+          ...process.env,
+          transportOptions: JSON.stringify(transportOptions),
+        },
+      }
+    );
     const childProcess = await threadsimple.start();
     childProcess.on('exit', (status) => {
       done.resolve();
-    })
+    });
     await done.promise;
-  };
-  
-  public async buildProduction(cwdArg: string, fromArg: string, toArg: string) {
-    const done = plugins.smartpromise.defer();
-    const threadsimple = new plugins.smartspawn.ThreadSimple(plugins.path.join(__dirname, './tsbundle.class.tsbundleprocess.js'), [], {
-      env: {
-        ...process.env,
-        tsbundleMode: 'production',
-        tsbundleCwd: cwdArg,
-        tsbundleFrom: fromArg,
-        tsbundleTo: toArg
-      }
-    })
-    const childProcess = await threadsimple.start();
-    childProcess.on('exit', (status) => {
-      done.resolve();
-    })
-    await done.promise;
-  };
+  }
 }

ts/tsbundle.class.tsbundleprocess.ts

@@ -1,158 +0,0 @@
-import * as plugins from './tsbundle.plugins';
-import { logger } from './tsbundle.logging';
-
-export class TsBundleProcess {
-  /**
-   * the basic default options for rollup
-   */
-  public getBaseOptions(
-    fromArg: string = `ts_web/index.ts`,
-    toArg: string = 'dist_bundle/bundle.js'
-  ) {
-    logger.log('info', `from: ${fromArg}`);
-    logger.log('info', `to: ${toArg}`);
-
-    const baseOptions: plugins.rollup.RollupOptions = {
-      input: fromArg,
-      output: {
-        name: 'tsbundle',
-        file: toArg,
-        format: 'iife',
-        sourcemap: true,
-      },
-      // Indicate here external modules you don't wanna include in your bundle (i.e.: 'lodash')
-      external: [],
-      watch: {
-        include: ['src/**'],
-      },
-      plugins: [
-        // Compile TypeScript files
-        plugins.rollupTypescript({
-          include: plugins.path.parse(fromArg).dir
-            ? plugins.path.parse(fromArg).dir + '/**/*.ts'
-            : '**/*.ts',
-          declaration: false,
-          emitDecoratorMetadata: true,
-          experimentalDecorators: true,
-          inlineSourceMap: true,
-          noEmitOnError: true,
-          lib: ['esnext', 'dom', 'es2017.object'],
-          noImplicitAny: false,
-          target: 'es2018',
-          allowSyntheticDefaultImports: true,
-          importsNotUsedAsValues: 'preserve',
-        }),
-        plugins.rollupJson(),
-        // Allow node_modules resolution, so you can use 'external' to control
-        // which external modules to include in the bundle
-        // https://github.com/rollup/rollup-plugin-node-resolve#usage
-        plugins.rollupResolve(),
-        plugins.rollupCommonjs({}),
-
-        // Resolve source maps to the original source
-        plugins.rollupSourceMaps(),
-        /*plugins.rollupBabel({
-          runtimeHelpers: true,
-          extensions: ['.js', '.jsx', '.ts', '.tsx'],
-          babelrc: false,
-          presets: [
-            [
-              '@babel/preset-env',
-              {
-                modules: false,
-                targets: {
-                  chrome: '41'
-                }
-              }
-            ]
-          ],
-          plugins: [
-            [
-              '@babel/plugin-transform-runtime',
-              {
-                regenerator: true
-              }
-            ]
-          ]
-        })*/
-      ],
-    };
-    return baseOptions;
-  }
-
-  public getOptionsTest(fromArg: string, toArg: string): plugins.rollup.RollupOptions {
-    return this.getBaseOptions(fromArg, toArg);
-  }
-
-  public getOptionsProduction(fromArg: string, toArg: string): plugins.rollup.RollupOptions {
-    const productionOptions = this.getBaseOptions(fromArg, toArg);
-    productionOptions.plugins.push(
-      plugins.rollupTerser({
-        compress: true,
-        mangle: true
-      })
-    );
-    return productionOptions;
-  }
-
-  constructor() {
-    // Nothing here
-  }
-
-  /**
-   * creates a bundle for the test enviroment
-   */
-  public async buildTest(
-    fromArg: string,
-    toArg: string,
-    bundlerArg: 'rollup' | 'parcel' = 'rollup'
-  ) {
-    // create a bundle
-    switch (bundlerArg) {
-      case 'rollup':
-        logger.log('info', `bundling for TEST!`);
-        const buildOptions = this.getOptionsTest(fromArg, toArg);
-        const bundle = await plugins.rollup.rollup(buildOptions);
-        bundle.generate(buildOptions.output as plugins.rollup.OutputOptions);
-        await bundle.write(buildOptions.output as plugins.rollup.OutputOptions);
-        logger.log('ok', `Successfully bundled files!`);
-        process.exit(0);
-      case 'parcel':
-        const parsedPath = plugins.path.parse(toArg);
-        const parcelInstance = new plugins.smartparcel.Parcel(fromArg, parsedPath.dir, parsedPath.base);
-        await parcelInstance.build();
-    }
-  }
-
-  /**
-   * creates a bundle for the production environment
-   */
-  public async buildProduction(fromArg: string, toArg: string) {
-    // create a bundle
-    logger.log('info', `bundling for PRODUCTION!`);
-    const buildOptions = this.getOptionsProduction(fromArg, toArg);
-    const bundle = await plugins.rollup.rollup(buildOptions);
-    bundle.generate(buildOptions.output as plugins.rollup.OutputOptions);
-    await bundle.write(buildOptions.output as plugins.rollup.OutputOptions);
-    logger.log('ok', `Successfully bundled files!`);
-    process.exit(0);
-  }
-}
-
-const run = async () => {
-  console.log('running spawned compilation process');
-  console.log(`cwd: ${process.env.tsbundleCwd}`);
-  console.log(`from: ${process.env.tsbundleFrom}`);
-  console.log(`to: ${process.env.tsbundleTo}`);
-  console.log(`mode: ${process.env.tsbundleMode}`);
-  process.chdir(process.env.tsbundleCwd);
-  console.log(`switched to ${process.cwd()}`)
-  const tsbundleProcessInstance = new TsBundleProcess();
-  if (process.env.tsbundleMode === 'test') {
-    tsbundleProcessInstance.buildTest(process.env.tsbundleFrom, process.env.tsbundleTo, process.env.tsbundleBundler as 'rollup' | 'parcel');
-  } else {
-    tsbundleProcessInstance.buildProduction(process.env.tsbundleFrom, process.env.tsbundleTo);
-  }
-}
-
-run();

ts/tsbundle.cli.ts

@@ -1,72 +1,49 @@
-import * as plugins from './tsbundle.plugins';
-import { TsBundle } from './tsbundle.class.tsbundle';
-import { HtmlHandler } from './tsbundle.htmlhandler';
-import { logger } from './tsbundle.logging';
+import * as plugins from './plugins.js';
+import { TsBundle } from './tsbundle.class.tsbundle.js';
+import { HtmlHandler } from './mod_html/index.js';
+import { logger } from './tsbundle.logging.js';
 
 export const runCli = async () => {
   const tsBundleCli = new plugins.smartcli.Smartcli();
-  tsBundleCli.standardTask().subscribe(async argvArg => {
+  tsBundleCli.standardTask().subscribe(async (argvArg) => {
     const tsbundle = new TsBundle();
-    // const htmlHandler = new HtmlHandler();
-    switch (true) {
-      case argvArg.production || process.env.CI:
-        await tsbundle.buildProduction(process.cwd(), argvArg.from, argvArg.to);
-        // await htmlHandler.minifyHtml();
-        break;
-      case argvArg.test:
-      default:
-        await tsbundle.buildTest(process.cwd(), argvArg.from, argvArg.to, 'rollup');
-        // await htmlHandler.copyHtml();
-        return;
-    }
+    await tsbundle.build(process.cwd(), argvArg.from, argvArg.to, argvArg);
+    return;
   });
 
-  tsBundleCli.addCommand('element').subscribe(async argvArg => {
-    const tsbundle = new TsBundle();
-    // const htmlHandler = new HtmlHandler();
-    switch (true) {
-      case argvArg.production || process.env.CI:
-        await tsbundle.buildProduction(process.cwd(), './ts_web/index.ts', './dist_bundle/bundle.js');
-        // await htmlHandler.minifyHtml();
-        break;
-      case argvArg.test:
-      default:
-        await tsbundle.buildTest(process.cwd(), './ts_web/index.ts', './dist_bundle/bundle.js', 'rollup');
-        // await htmlHandler.copyHtml();
-        return;
-    }
-  });
-
-  tsBundleCli.addCommand('npm').subscribe(async argvArg => {
-    const tsbundle = new TsBundle();
-    // const htmlHandler = new HtmlHandler();
-    switch (true) {
-      case argvArg.production || process.env.CI:
-        await tsbundle.buildProduction(process.cwd(), './ts/index.ts', './dist_bundle/bundle.js');
-        // await htmlHandler.minifyHtml();
-        break;
-      case argvArg.test:
-      default:
-        await tsbundle.buildTest(process.cwd(), './ts/index.ts', './dist_bundle/bundle.js', 'rollup');
-        // await htmlHandler.copyHtml();
-        return;
-    }
-  });
-
-  tsBundleCli.addCommand('website').subscribe(async argvArg => {
+  tsBundleCli.addCommand('element').subscribe(async (argvArg) => {
     const tsbundle = new TsBundle();
     const htmlHandler = new HtmlHandler();
-    switch (true) {
-      case argvArg.production || process.env.CI:
-        await tsbundle.buildProduction(process.cwd(), './ts_web/index.ts', './dist_serve/bundle.js');
-        await htmlHandler.minifyHtml();
-        break;
-      case argvArg.test:
-      default:
-        await tsbundle.buildTest(process.cwd(), './ts_web/index.ts', './dist_serve/bundle.js', 'rollup');
-        await htmlHandler.copyHtml();
-        return;
-    }
+    // const htmlHandler = new HtmlHandler();
+    await tsbundle.build(
+      process.cwd(),
+      './ts_web/index.ts',
+      './dist_bundle/bundle.js',
+      argvArg
+    );
+  });
+
+  tsBundleCli.addCommand('npm').subscribe(async (argvArg) => {
+    const tsbundle = new TsBundle();
+    const htmlHandler = new HtmlHandler();
+    await tsbundle.build(
+      process.cwd(),
+      './ts/index.ts',
+      './dist_bundle/bundle.js',
+      argvArg
+    );
+  });
+
+  tsBundleCli.addCommand('website').subscribe(async (argvArg) => {
+    const tsbundle = new TsBundle();
+    const htmlHandler = new HtmlHandler();
+    await tsbundle.build(
+      process.cwd(),
+      './ts_web/index.ts',
+      './dist_serve/bundle.js',
+      argvArg
+    );
+    await htmlHandler.minifyHtml('./html/index.html', './dist_serve/index.html')
   });
 
   tsBundleCli.startParse();

ts/tsbundle.htmlhandler.ts

@@ -1,38 +0,0 @@
-import * as plugins from './tsbundle.plugins';
-import * as paths from './tsbundle.paths';
-
-export class HtmlHandler {
-  public sourceFilePath: string = plugins.path.join(paths.htmlDir, 'index.html');
-  public targetFilePath: string = plugins.path.join(paths.distServeDir, 'index.html');
-
-  public async checkIfExists() {
-    return plugins.smartfile.fs.fileExists(this.sourceFilePath);
-  }
-
-  // copies the html
-  public async copyHtml(targetPathArg = this.targetFilePath) {
-    if (!(await this.checkIfExists())) {
-      return;
-    }
-    await plugins.smartfile.fs.copy(this.sourceFilePath, targetPathArg);
-  }
-
-  // copies and minifies the html
-  public async minifyHtml(targetPathArg = this.targetFilePath) {
-    if (!(await this.checkIfExists())) {
-      return;
-    }
-    const fileString = plugins.smartfile.fs.toStringSync(this.sourceFilePath);
-    const minifiedHtml = plugins.htmlMinifier.minify(fileString, {
-      minifyCSS: true,
-      minifyJS: true,
-      sortAttributes: true,
-      sortClassName: true,
-      removeAttributeQuotes: true,
-      collapseWhitespace: true,
-      collapseInlineTagWhitespace: true,
-      removeComments: true
-    });
-    plugins.smartfile.memory.toFsSync(minifiedHtml, targetPathArg);
-  }
-}

ts/tsbundle.logging.ts

@@ -1,4 +1,4 @@
-import * as plugins from './tsbundle.plugins';
+import * as plugins from './plugins.js';
 
 export const logger = new plugins.smartlog.Smartlog({
   logContext: {
@@ -7,9 +7,9 @@ export const logger = new plugins.smartlog.Smartlog({
     containerName: 'Some Containername',
     environment: 'local',
     runtime: 'node',
-    zone: 'gitzone'
+    zone: 'gitzone',
   },
-  minimumLogLevel: 'silly'
+  minimumLogLevel: 'silly',
 });
 
 logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());

ts/tsbundle.paths.ts

@@ -1,7 +0,0 @@
-import * as plugins from './tsbundle.plugins';
-
-export const cwd = process.cwd();
-export const packageDir = plugins.path.join(__dirname, '../');
-export const htmlDir = plugins.path.join(cwd, './html');
-export const distServeDir = plugins.path.join(cwd, './dist_serve');
-export const assetsDir = plugins.path.join(packageDir, 'assets');

ts/tsbundle.plugins.ts

@@ -1,39 +0,0 @@
-// node native
-import * as path from 'path';
-
-export { path };
-
-// pushrocks scope
-import * as smartcli from '@pushrocks/smartcli';
-import * as smartfile from '@pushrocks/smartfile';
-import * as smartlog from '@pushrocks/smartlog';
-import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
-import * as smartparcel from '@pushrocks/smartparcel';
-import * as smartpromise from '@pushrocks/smartpromise';
-import * as smartspawn from '@pushrocks/smartspawn';
-
-export { smartcli, smartfile, smartlog, smartlogDestinationLocal, smartparcel, smartpromise, smartspawn };
-
-// third party scope
-import * as rollup from 'rollup';
-import rollupBabel from 'rollup-plugin-babel';
-import rollupCommonjs from '@rollup/plugin-commonjs';
-import rollupJson from '@rollup/plugin-json';
-import rollupResolve from '@rollup/plugin-node-resolve';
-import rollupSourceMaps from 'rollup-plugin-sourcemaps';
-import { terser as rollupTerser } from 'rollup-plugin-terser';
-import rollupTypescript from '@rollup/plugin-typescript';
-
-import * as htmlMinifier from 'html-minifier';
-
-export {
-  rollup,
-  rollupBabel,
-  rollupCommonjs,
-  rollupJson,
-  rollupResolve,
-  rollupSourceMaps,
-  rollupTerser,
-  rollupTypescript,
-  htmlMinifier
-};

tsconfig.json

@@ -1,5 +1,11 @@
 {
   "compilerOptions": {
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "target": "ES2020",
+    "module": "ES2020",
+    "moduleResolution": "node12",
+    "useDefineForClassFields": false,
+    "preserveValueImports": true,
+    "esModuleInterop": true
   }
 }

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"
-}