1.0.56

.gitlab-ci.yml

@@ -1,5 +1,7 @@
 # gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+variables:
+  GIT_STRATEGY: clone
 
 cache:
   paths:
@@ -38,19 +40,7 @@ snyk:
 # test stage
 # ====================
 
-testLTS:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
+testStable:
   stage: test
   script:
   - npmci npm prepare
@@ -60,12 +50,24 @@ testSTABLE:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - priv
+
+testBuild:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
   - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
+  - npmci node install lts
   - npmci npm publish
   only:
   - tags
@@ -98,7 +100,9 @@ trigger:
   - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
+  image: hosttoday/ht-docker-dbase:npmci
+  services:
+   - docker:18-dind
   stage: metadata
   script:
     - npmci command npm install -g @gitzone/tsdoc

.snyk

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

cli.js

@@ -1,3 +1,4 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
-require('./dist/index');
+const cliTool = require('./dist/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();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tsbundle",
-  "version": "1.0.26",
+  "version": "1.0.56",
   "private": false,
   "description": "a bundler using rollup for painless bundling of web projects",
   "main": "dist/index.js",
@@ -16,41 +16,43 @@
     "tsbundle": "cli.js"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.11",
-    "@gitzone/tsrun": "^1.2.6",
-    "@gitzone/tstest": "^1.0.15",
-    "@pushrocks/tapbundle": "^3.0.7",
-    "@types/node": "^11.13.8",
-    "tslint": "^5.11.0",
+    "@gitzone/tsbuild": "^2.1.20",
+    "@gitzone/tsrun": "^1.2.8",
+    "@gitzone/tstest": "^1.0.28",
+    "@pushrocks/tapbundle": "^3.2.0",
+    "tslint": "^6.1.0",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@babel/core": "^7.4.4",
-    "@babel/plugin-proposal-class-properties": "^7.4.4",
-    "@babel/plugin-proposal-decorators": "^7.4.4",
-    "@babel/plugin-transform-runtime": "^7.4.4",
-    "@babel/preset-env": "^7.4.4",
-    "@babel/runtime": "^7.4.4",
+    "@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.7",
-    "@pushrocks/smartfile": "^7.0.2",
-    "@pushrocks/smartlog": "^2.0.19",
-    "@pushrocks/smartlog-destination-local": "^7.0.5",
+    "@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",
     "html-minifier": "^4.0.0",
-    "rollup": "^1.10.1",
-    "rollup-plugin-babel": "^4.3.2",
-    "rollup-plugin-commonjs": "^9.3.4",
-    "rollup-plugin-node-resolve": "^4.2.3",
-    "rollup-plugin-sourcemaps": "^0.4.2",
-    "rollup-plugin-terser": "^5.0.0",
-    "rollup-plugin-typescript2": "^0.21.0"
+    "rollup": "^2.0.6",
+    "rollup-plugin-babel": "^4.4.0",
+    "rollup-plugin-sourcemaps": "^0.5.0",
+    "rollup-plugin-terser": "^5.3.0",
+    "terser": "^4.6.6"
   },
   "files": [
     "ts/*",
     "ts_web/*",
     "dist/*",
     "dist_web/*",
+    "dist_ts_web/*",
     "assets/*",
     "cli.js",
     "npmextra.json",

readme.md

@@ -30,6 +30,6 @@ tsbundle will bundle modern JavaScript websites in an Google Bot conformant way
 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

@@ -2,8 +2,7 @@ import { expect, tap } from '@pushrocks/tapbundle';
 import * as tsbundle from '../ts/index';
 
 tap.test('first test', async () => {
-  tsbundle;
-  console.log('hi');
+  await tsbundle.runCli();
 });
 
 tap.start();

ts/index.ts

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

ts/tsbundle.class.tsbundle.ts

@@ -2,49 +2,18 @@ import * as plugins from './tsbundle.plugins';
 import { logger } from './tsbundle.logging';
 
 export class TsBundle {
-  public optionsTest: plugins.rollup.RollupOptions = this.getBaseOptions();
-  public optionsProduction: plugins.rollup.RollupOptions = (() => {
-    const productionOptions = this.getBaseOptions();
-    productionOptions.plugins.push(plugins.rollupTerser());
-    return productionOptions;
-  })();
-
-  constructor() {}
-
-  /**
-   * creates a bundle for the test enviroment
-   */
-  public async buildTest() {
-    // create a bundle
-    logger.log('info', `bundling for TEST!`);
-    const bundle = await plugins.rollup.rollup(this.optionsTest);
-    bundle.generate(this.optionsTest.output);
-    await bundle.write(this.optionsTest.output);
-    logger.log('ok', `Successfully bundled files!`);
-  }
-
-  /**
-   * creates a bundle for the production environment
-   */
-  public async buildProduction() {
-    // create a bundle
-    logger.log('info', `bundling for PRODUCTION!`);
-    const bundle = await plugins.rollup.rollup(this.optionsProduction);
-    bundle.generate(this.optionsProduction.output);
-    await bundle.write(this.optionsProduction.output);
-    logger.log('ok', `Successfully bundled files!`);
-  }
-
   /**
    * the basic default options for rollup
    */
-  public getBaseOptions() {
+  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: `ts_web/index.ts`,
+      input: fromArg,
       output: {
         name: 'tsbundle',
-        // file: 'dist_web/bundle.js',
-        file: 'dist_web/bundle.js',
+        file: toArg,
         format: 'iife',
         sourcemap: true
       },
@@ -56,19 +25,14 @@ export class TsBundle {
       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
-            }
-          }
+          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
@@ -81,8 +45,8 @@ export class TsBundle {
         }),
 
         // Resolve source maps to the original source
-        plugins.rollupSourceMaps(),
-        plugins.rollupBabel({
+        plugins.rollupSourceMaps()
+        /*plugins.rollupBabel({
           runtimeHelpers: true,
           extensions: ['.js', '.jsx', '.ts', '.tsx'],
           babelrc: false,
@@ -105,9 +69,53 @@ export class TsBundle {
               }
             ]
           ]
-        })
+        })*/
       ]
     };
     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!`);
+  }
 }

ts/tsbundle.cli.ts

@@ -6,19 +6,49 @@ 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(argvArg.from, argvArg.to);
+        // await htmlHandler.minifyHtml();
+        break;
+      case argvArg.test:
+      default:
+        await tsbundle.buildTest(argvArg.from, argvArg.to);
+        // 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('./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 htmlHandler.copyHtml();
+        return;
+    }
+  });
+
+  tsBundleCli.addCommand('website').subscribe(async argvArg => {
     const tsbundle = new TsBundle();
     const htmlHandler = new HtmlHandler();
     switch (true) {
-      case argvArg.production:
-        await tsbundle.buildProduction();
+      case argvArg.production || process.env.CI:
+        await tsbundle.buildProduction('./ts_web/index.ts', './dist_serve/bundle.js');
         await htmlHandler.minifyHtml();
         break;
       case argvArg.test:
-        await tsbundle.buildTest();
-        await htmlHandler.copyHtml();
-        break;
       default:
-        logger.log('error', `Can not determine build target environement. Please specify via --production or --test`)
+        await tsbundle.buildTest('./ts_web/index.ts', './dist_serve/bundle.js');
+        await htmlHandler.copyHtml();
         return;
     }
   });

ts/tsbundle.htmlhandler.ts

@@ -3,18 +3,25 @@ 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() {
-    await plugins.smartfile.fs.copy(
-      this.sourceFilePath,
-      this.targetFilePath
-    );
+  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() {
+  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,
@@ -24,9 +31,8 @@ export class HtmlHandler {
       removeAttributeQuotes: true,
       collapseWhitespace: true,
       collapseInlineTagWhitespace: true,
-      removeComments: 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

@@ -1,9 +1,7 @@
 // node native
 import * as path from 'path';
 
-export {
-  path
-};
+export { path };
 
 // pushrocks scope
 import * as smartcli from '@pushrocks/smartcli';
@@ -16,11 +14,11 @@ export { smartcli, smartfile, smartlog, smartlogDestinationLocal };
 // third party scope
 import * as rollup from 'rollup';
 import rollupBabel from 'rollup-plugin-babel';
-import rollupCommonjs from 'rollup-plugin-commonjs';
-import rollupResolve from 'rollup-plugin-node-resolve';
+import rollupCommonjs from '@rollup/plugin-commonjs';
+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';