1.0.86

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
+dist_*/
-dist_serve/
-dist_ts_web/
 
 # custom

.gitlab-ci.yml

@@ -4,7 +4,7 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 cache:
   paths:
     - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
   - security
@@ -19,57 +19,72 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
-snyk:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
+    - npmci command npm install --production --ignore-scripts
-    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command snyk test
+    - npmci command npm audit --audit-level=high --only=prod --production
   tags:
     - docker
-  - notpriv
+  allow_failure: true
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
+  tags:
+    - docker
+  allow_failure: true
 
 # ====================
 # test stage
 # ====================
 
-testLTS:
+testStable:
   stage: test
   script:
     - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
     - npmci npm install
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
-  - notpriv
 
 testBuild:
   stage: test
   script:
     - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
     - npmci npm install
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
-  - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install lts
+    - npmci node install stable
     - npmci npm publish
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -79,11 +94,15 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
+    - npmci npm prepare
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
+    - lossless
     - docker
     - priv
 
@@ -94,18 +113,20 @@ trigger:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
+    - npmci node install lts
     - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "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"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

cli.js

@@ -1,3 +1,4 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
-require('./dist/index');
+const cliTool = require('./dist_ts/index');
+cliTool.runCli();

cli.ts.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
 require('@gitzone/tsrun');
-require('./ts/index');
+const cliTool = require('./ts/index');
+cliTool.runCli();

npmextra.json

@@ -1,5 +1,6 @@
 {
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "gitzone",

package.json

@@ -1,57 +1,63 @@
 {
   "name": "@gitzone/tsbundle",
-  "version": "1.0.35",
+  "version": "1.0.86",
   "private": false,
   "description": "a bundler using rollup for painless bundling of web projects",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
-    "test": "cd test && node ../cli.ts.js --production",
+    "test": "npm run build && (tstest test/) && (cd test && node ../cli.js --production)",
-    "build": "(tsbuild)",
+    "build": "(tsbuild --web)"
-    "format": "(gitzone format)"
   },
   "bin": {
     "tsbundle": "cli.js"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.11",
+    "@gitzone/tsbuild": "^2.1.26",
-    "@gitzone/tsrun": "^1.2.6",
+    "@gitzone/tsrun": "^1.2.17",
-    "@gitzone/tstest": "^1.0.15",
+    "@gitzone/tstest": "^1.0.57",
-    "@pushrocks/tapbundle": "^3.0.7",
+    "@pushrocks/tapbundle": "^3.2.14",
-    "@types/node": "^12.6.6",
+    "tslint": "^6.1.3",
-    "tslint": "^5.11.0",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@babel/core": "^7.4.4",
+    "@babel/core": "^7.15.0",
-    "@babel/plugin-proposal-class-properties": "^7.4.4",
+    "@babel/plugin-proposal-class-properties": "^7.14.5",
-    "@babel/plugin-proposal-decorators": "^7.4.4",
+    "@babel/plugin-proposal-decorators": "^7.14.5",
-    "@babel/plugin-transform-runtime": "^7.4.4",
+    "@babel/plugin-transform-runtime": "^7.15.0",
-    "@babel/preset-env": "^7.4.4",
+    "@babel/preset-env": "^7.15.0",
-    "@babel/runtime": "^7.4.4",
+    "@babel/runtime": "^7.15.3",
-    "@pushrocks/early": "^3.0.3",
+    "@pushrocks/early": "^3.0.6",
-    "@pushrocks/smartcli": "^3.0.7",
+    "@pushrocks/smartcli": "^3.0.14",
-    "@pushrocks/smartfile": "^7.0.2",
+    "@pushrocks/smartfile": "^8.0.10",
-    "@pushrocks/smartlog": "^2.0.19",
+    "@pushrocks/smartlog": "^2.0.44",
-    "@pushrocks/smartlog-destination-local": "^8.0.2",
+    "@pushrocks/smartlog-destination-local": "^8.0.8",
-    "@types/html-minifier": "^3.5.3",
+    "@pushrocks/smartparcel": "^1.0.9",
+    "@pushrocks/smartpromise": "^3.1.6",
+    "@pushrocks/smartspawn": "^2.0.9",
+    "@rollup/plugin-commonjs": "^19.0.1",
+    "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-node-resolve": "^13.0.4",
+    "@rollup/plugin-typescript": "^8.2.5",
+    "@types/html-minifier": "^4.0.1",
+    "@types/node": "^16.7.4",
     "html-minifier": "^4.0.0",
-    "rollup": "^1.10.1",
+    "rollup": "^2.56.3",
-    "rollup-plugin-babel": "^4.3.2",
+    "rollup-plugin-babel": "^4.4.0",
-    "rollup-plugin-commonjs": "^10.0.1",
+    "rollup-plugin-sourcemaps": "^0.6.3",
-    "rollup-plugin-node-resolve": "^5.2.0",
+    "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-sourcemaps": "^0.4.2",
+    "typescript": "^4.4.2"
-    "rollup-plugin-terser": "^5.0.0",
-    "rollup-plugin-typescript2": "^0.22.0"
   },
   "files": [
-    "ts/*",
+    "ts/**/*",
-    "ts_web/*",
+    "ts_web/**/*",
-    "dist/*",
+    "dist/**/*",
-    "dist_web/*",
+    "dist_*/**/*",
-    "assets/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"

readme.md

@@ -8,7 +8,7 @@ a bundler using rollup for painless bundling of web projects
 * [docs (typedoc)](https://gitzone.gitlab.io/tsbundle/)
 
 ## Status for master
-[![build status](https://gitlab.com/gitzone/tsbundle/badges/master/build.svg)](https://gitlab.com/gitzone/tsbundle/commits/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)
@@ -22,14 +22,49 @@ Use TypeScript for best in class intellisense.
 
 tsbundle will bundle modern JavaScript websites in an Google Bot conformant way so things like AdSense do work.
 
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+tsbundle supports two modes of usage: CLI and API usage.
-> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
 
-[![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)
+### CLI
+
+```shell
+# Note: This is code that belongs into your terminal ;)
+# Install the tool for cli usage
+
+# Globally
+npm install -g @gitzone/tsbundle
+
+# Locally for use in your pacakge.json
+npm install --save-dev @gitzone/tsbundle
+
+# then use it
+tsbundle --from="./ts/index.ts" --to="dist/bundle.js"
+
+## note you can call tsbundle without arguments. Default values are --from="./ts_web/index.ts" --to="dist_bundle/bundle.js"
+## You can use --production to enable minification using terser
+```
+
+## API
+You are using TypeScript, aren't you? Most of the stuff is apparent from the IDE intellisense.
+
+```typescript
+import { TsBundle } from '@gitozne/tsbundle';
+
+const myTsBundleInstance = new TsBundle();
+
+const run = async () => {
+  await myTsBundleInstance.buildTest('./from/my.ts', './to/mybundle.js')
+  // OR
+  await myTsBundleInstance.buildProduction('./from/my.ts', './to/mybundle.js')
+}
+```
+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
 
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
 
-[![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.ts

@@ -1,9 +1,16 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import * as tsbundle from '../ts/index';
+import * as tsbundle from '../dist_ts/index';
 
-tap.test('first test', async () => {
+import * as path from 'path';
-  tsbundle;
+
-  console.log('hi');
+tap.test('should bundle test', async () => {
-});
+  const tsbundleInstance = new tsbundle.TsBundle();
+  await tsbundleInstance.buildTest(process.cwd() + '/test', './ts_web/index.ts', './dist_manual/test.js', 'rollup')
+})
+
+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

@@ -1,3 +1,18 @@
-const myConst = 'hello';
+const myConst: string = 'hello';
+
+function sealed(constructor: Function) {
+  Object.seal(constructor);
+  Object.seal(constructor.prototype);
+}
+
+@sealed
+class BugReport {
+  type = "report";
+  title: string;
+
+  constructor(t: string) {
+    this.title = t;
+  }
+}
 
 console.log(myConst);

ts/index.ts

@@ -7,6 +7,7 @@ import { logger } from './tsbundle.logging';
 import { runCli } from './tsbundle.cli';
 early.stop();
 
-if (process.env.CLI_CALL) {
+// lets make this usable programmatically
-  runCli();
+export * from './tsbundle.class.tsbundle';
-}
+export * from './tsbundle.htmlhandler';
+export { runCli };

ts/tsbundle.class.tsbundle.ts

@@ -2,114 +2,40 @@ import * as plugins from './tsbundle.plugins';
 import { logger } from './tsbundle.logging';
 
 export class TsBundle {
-  /**
+  public async buildTest(cwdArg: string, fromArg: string, toArg: string, bundlerArg: 'rollup' | 'parcel') {
-   * the basic default options for rollup
+    const done = plugins.smartpromise.defer();
-   */
+    const threadsimple = new plugins.smartspawn.ThreadSimple(plugins.path.join(__dirname, './tsbundle.class.tsbundleprocess.js'), [], {
-  public getBaseOptions(fromArg: string = `ts_web/index.ts`, toArg: string = 'dist_web/bundle.js') {
+      env: {
-    const baseOptions: plugins.rollup.RollupOptions = {
+        ...process.env,
-      input: fromArg,
+        tsbundleMode: 'test',
-      output: {
+        tsbundleCwd: cwdArg,
-        name: 'tsbundle',
+        tsbundleFrom: fromArg,
-        file: toArg,
+        tsbundleTo: toArg,
-        format: 'iife',
+        tsbundleBundler: bundlerArg
-        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({
-          useTsconfigDeclarationDir: true,
-          tsconfigOverride: {
-            compilerOptions: {
-              declaration: true,
-              emitDecoratorMetadata: true,
-              experimentalDecorators: true,
-              inlineSourceMap: true,
-              noEmitOnError: true,
-              lib: ['es2017', 'dom'],
-              target: 'es2017',
-              noImplicitAny: false
       }
-          }
+    })
-        }),
+    const childProcess = await threadsimple.start();
-        // Allow node_modules resolution, so you can use 'external' to control
+    childProcess.on('exit', (status) => {
-        // which external modules to include in the bundle
+      done.resolve();
-        // https://github.com/rollup/rollup-plugin-node-resolve#usage
+    })
-        plugins.rollupResolve(),
+    await done.promise;
-        plugins.rollupCommonjs({
-          namedExports: {
-            'node_modules/@pushrocks/smartstate/dist/index.js': ['Smartstate']
-          }
-        }),
-
-        // 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 {
+  public async buildProduction(cwdArg: string, fromArg: string, toArg: string) {
-    return this.getBaseOptions();
+    const done = plugins.smartpromise.defer();
-  }
+    const threadsimple = new plugins.smartspawn.ThreadSimple(plugins.path.join(__dirname, './tsbundle.class.tsbundleprocess.js'), [], {
-
+      env: {
-  public getOptionsProduction(fromArg: string, toArg: string): plugins.rollup.RollupOptions {
+        ...process.env,
-    const productionOptions = this.getBaseOptions();
+        tsbundleMode: 'production',
-    productionOptions.plugins.push(plugins.rollupTerser());
+        tsbundleCwd: cwdArg,
-    return productionOptions;
+        tsbundleFrom: fromArg,
-  }
+        tsbundleTo: toArg
-
-  constructor() {}
-
-  /**
-   * creates a bundle for the test enviroment
-   */
-  public async buildTest(fromArg: string, toArg: string) {
-    // create a bundle
-    logger.log('info', `bundling for TEST!`);
-    const bundle = await plugins.rollup.rollup(this.getOptionsTest(fromArg, toArg));
-    bundle.generate(this.getOptionsTest(fromArg, toArg).output);
-    await bundle.write(this.getOptionsTest(fromArg, toArg).output);
-    logger.log('ok', `Successfully bundled files!`);
-  }
-
-  /**
-   * creates a bundle for the production environment
-   */
-  public async buildProduction(fromArg: string, toArg: string) {
-    // create a bundle
-    logger.log('info', `bundling for PRODUCTION!`);
-    const bundle = await plugins.rollup.rollup(this.getOptionsProduction(fromArg, toArg));
-    bundle.generate(this.getOptionsProduction(fromArg, toArg).output);
-    await bundle.write(this.getOptionsProduction(fromArg, toArg).output);
-    logger.log('ok', `Successfully bundled files!`);
       }
+    })
+    const childProcess = await threadsimple.start();
+    childProcess.on('exit', (status) => {
+      done.resolve();
+    })
+    await done.promise;
+  };
 }

ts/tsbundle.class.tsbundleprocess.ts

@@ -0,0 +1,157 @@
+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,
+        }),
+        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

@@ -6,22 +6,68 @@ import { logger } from './tsbundle.logging';
 export const runCli = async () => {
   const tsBundleCli = new plugins.smartcli.Smartcli();
   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;
+    }
+  });
+
+  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 => {
     const tsbundle = new TsBundle();
     const htmlHandler = new HtmlHandler();
     switch (true) {
       case argvArg.production || process.env.CI:
-        await tsbundle.buildProduction(null, null);
+        await tsbundle.buildProduction(process.cwd(), './ts_web/index.ts', './dist_serve/bundle.js');
         await htmlHandler.minifyHtml();
         break;
       case argvArg.test:
       default:
-        await tsbundle.buildTest(null, null);
+        await tsbundle.buildTest(process.cwd(), './ts_web/index.ts', './dist_serve/bundle.js', 'rollup');
         await htmlHandler.copyHtml();
         return;
     }
   });
 
-
-
   tsBundleCli.startParse();
 };

ts/tsbundle.htmlhandler.ts

@@ -3,22 +3,22 @@ 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.distWebDir, '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() {
+  public async copyHtml(targetPathArg = this.targetFilePath) {
     if (!(await this.checkIfExists())) {
       return;
     }
-    await plugins.smartfile.fs.copy(this.sourceFilePath, this.targetFilePath);
+    await plugins.smartfile.fs.copy(this.sourceFilePath, targetPathArg);
   }
 
   // copies and minifies the html
-  public async minifyHtml() {
+  public async minifyHtml(targetPathArg = this.targetFilePath) {
     if (!(await this.checkIfExists())) {
       return;
     }
@@ -33,6 +33,6 @@ export class HtmlHandler {
       collapseInlineTagWhitespace: true,
       removeComments: true
     });
-    plugins.smartfile.memory.toFsSync(minifiedHtml, this.targetFilePath);
+    plugins.smartfile.memory.toFsSync(minifiedHtml, targetPathArg);
   }
 }

ts/tsbundle.paths.ts

@@ -3,4 +3,5 @@ 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 distWebDir = plugins.path.join(cwd, './dist_web');
+export const distServeDir = plugins.path.join(cwd, './dist_serve');
+export const assetsDir = plugins.path.join(packageDir, 'assets');

ts/tsbundle.plugins.ts

@@ -8,17 +8,21 @@ 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 };
+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 rollupCommonjs from '@rollup/plugin-commonjs';
-import rollupResolve from 'rollup-plugin-node-resolve';
+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-typescript2';
+import rollupTypescript from '@rollup/plugin-typescript';
 
 import * as htmlMinifier from 'html-minifier';
 
@@ -26,6 +30,7 @@ export {
   rollup,
   rollupBabel,
   rollupCommonjs,
+  rollupJson,
   rollupResolve,
   rollupSourceMaps,
   rollupTerser,

tsconfig.json

@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true
+  }
+}