1.0.91

.gitlab-ci.yml

@@ -19,22 +19,36 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-snyk:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+  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 snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -49,9 +63,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -62,9 +74,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -84,6 +94,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.snyk

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

cli.js

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

package.json

@@ -1,51 +1,54 @@
 {
   "name": "@gitzone/tsbundle",
-  "version": "1.0.57",
+  "version": "1.0.91",
   "private": false,
   "description": "a bundler using rollup for painless bundling of web projects",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
-    "test": "cd test && node ../cli.ts.js --production",
-    "build": "(tsbuild)",
-    "format": "(gitzone format)"
+    "test": "npm run build && (tstest test/) && (cd test && node ../cli.js --production)",
+    "build": "(tsbuild --web)"
   },
   "bin": {
     "tsbundle": "cli.js"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.20",
-    "@gitzone/tsrun": "^1.2.8",
-    "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.2.0",
-    "tslint": "^6.1.0",
+    "@gitzone/tsbuild": "^2.1.29",
+    "@gitzone/tsrun": "^1.2.18",
+    "@gitzone/tstest": "^1.0.64",
+    "@pushrocks/tapbundle": "^4.0.8",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@babel/core": "^7.8.7",
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/plugin-proposal-decorators": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.8.3",
-    "@babel/preset-env": "^7.8.7",
-    "@babel/runtime": "^7.8.7",
-    "@pushrocks/early": "^3.0.3",
-    "@pushrocks/smartcli": "^3.0.9",
-    "@pushrocks/smartfile": "^7.0.9",
-    "@pushrocks/smartlog": "^2.0.21",
-    "@pushrocks/smartlog-destination-local": "^8.0.2",
-    "@rollup/plugin-commonjs": "^11.0.2",
-    "@rollup/plugin-node-resolve": "^7.1.1",
-    "@rollup/plugin-typescript": "^4.0.0",
-    "@types/html-minifier": "^3.5.3",
-    "@types/node": "^13.9.1",
+    "@babel/core": "^7.17.5",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/plugin-proposal-decorators": "^7.17.2",
+    "@babel/plugin-transform-runtime": "^7.17.0",
+    "@babel/preset-env": "^7.16.11",
+    "@babel/runtime": "^7.17.2",
+    "@pushrocks/early": "^3.0.6",
+    "@pushrocks/smartcli": "^3.0.14",
+    "@pushrocks/smartfile": "^9.0.5",
+    "@pushrocks/smartlog": "^2.0.44",
+    "@pushrocks/smartlog-destination-local": "^8.0.8",
+    "@pushrocks/smartparcel": "^1.0.13",
+    "@pushrocks/smartpromise": "^3.1.7",
+    "@pushrocks/smartspawn": "^2.0.9",
+    "@rollup/plugin-commonjs": "^21.0.2",
+    "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-node-resolve": "^13.1.3",
+    "@rollup/plugin-typescript": "^8.3.1",
+    "@types/html-minifier": "^4.0.2",
+    "@types/node": "^17.0.21",
     "html-minifier": "^4.0.0",
-    "rollup": "^2.0.6",
+    "rollup": "^2.70.0",
     "rollup-plugin-babel": "^4.4.0",
-    "rollup-plugin-sourcemaps": "^0.5.0",
-    "rollup-plugin-terser": "^5.3.0",
-    "terser": "^4.6.6"
+    "rollup-plugin-sourcemaps": "^0.6.3",
+    "rollup-plugin-terser": "^7.0.2",
+    "typescript": "^4.6.2"
   },
   "files": [
     "ts/**/*",

readme.md

@@ -22,11 +22,41 @@ 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)
-> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+tsbundle supports two modes of usage: CLI and API usage.
 
-[![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
 

test/test.ts

@@ -1,8 +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 () => {
-  await tsbundle.runCli();
-});
+import * as path from 'path';
+
+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/tsbundle.class.tsbundle.ts

@@ -2,125 +2,40 @@ import * as plugins from './tsbundle.plugins';
 import { logger } from './tsbundle.logging';
 
 export class TsBundle {
-  /**
-   * 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({
-          declaration: false,
-          emitDecoratorMetadata: true,
-          experimentalDecorators: true,
-          inlineSourceMap: true,
-          noEmitOnError: true,
-          lib: ['esnext', 'dom'],
-          noImplicitAny: false,
-          target: 'es2018'
-        }),
-        // 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({
-          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 {
-    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,
-        sourcemap: true
-      })
-    );
-    return productionOptions;
-  }
-
-  constructor() {
-    // Nothing here
-  }
-
-  /**
-   * creates a bundle for the test enviroment
-   */
-  public async buildTest(fromArg: string, toArg: string) {
-    // create a bundle
-    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!`);
-  }
-
-  /**
-   * 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!`);
-  }
+  public async buildTest(cwdArg: string, fromArg: string, toArg: string, bundlerArg: 'rollup' | 'parcel') {
+    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 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

@@ -0,0 +1,134 @@
+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()
+      ],
+    };
+    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

@@ -10,12 +10,12 @@ export const runCli = async () => {
     // const htmlHandler = new HtmlHandler();
     switch (true) {
       case argvArg.production || process.env.CI:
-        await tsbundle.buildProduction(argvArg.from, argvArg.to);
+        await tsbundle.buildProduction(process.cwd(), argvArg.from, argvArg.to);
         // await htmlHandler.minifyHtml();
         break;
       case argvArg.test:
       default:
-        await tsbundle.buildTest(argvArg.from, argvArg.to);
+        await tsbundle.buildTest(process.cwd(), argvArg.from, argvArg.to, 'rollup');
         // await htmlHandler.copyHtml();
         return;
     }
@@ -26,12 +26,28 @@ export const runCli = async () => {
     // const htmlHandler = new HtmlHandler();
     switch (true) {
       case argvArg.production || process.env.CI:
-        await tsbundle.buildProduction('./ts_web/index.ts', './dist_bundle/bundle.js');
+        await tsbundle.buildProduction(process.cwd(), './ts_web/index.ts', './dist_bundle/bundle.js');
         // await htmlHandler.minifyHtml();
         break;
       case argvArg.test:
       default:
-        await tsbundle.buildTest('./ts_web/index.ts', './dist_bundle/bundle.js');
+        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;
     }
@@ -42,12 +58,12 @@ export const runCli = async () => {
     const htmlHandler = new HtmlHandler();
     switch (true) {
       case argvArg.production || process.env.CI:
-        await tsbundle.buildProduction('./ts_web/index.ts', './dist_serve/bundle.js');
+        await tsbundle.buildProduction(process.cwd(), './ts_web/index.ts', './dist_serve/bundle.js');
         await htmlHandler.minifyHtml();
         break;
       case argvArg.test:
       default:
-        await tsbundle.buildTest('./ts_web/index.ts', './dist_serve/bundle.js');
+        await tsbundle.buildTest(process.cwd(), './ts_web/index.ts', './dist_serve/bundle.js', 'rollup');
         await htmlHandler.copyHtml();
         return;
     }

ts/tsbundle.plugins.ts

@@ -8,13 +8,17 @@ 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 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';
@@ -26,6 +30,7 @@ export {
   rollup,
   rollupBabel,
   rollupCommonjs,
+  rollupJson,
   rollupResolve,
   rollupSourceMaps,
   rollupTerser,

tsconfig.json

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