1.0.45

.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: {}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tsbundle",
-  "version": "1.0.24",
+  "version": "1.0.45",
   "private": false,
   "description": "a bundler using rollup for painless bundling of web projects",
   "main": "dist/index.js",
@@ -16,38 +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.17",
+    "@gitzone/tsrun": "^1.2.8",
+    "@gitzone/tstest": "^1.0.28",
+    "@pushrocks/tapbundle": "^3.0.13",
+    "@types/node": "^12.7.11",
+    "tslint": "^5.20.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.6.2",
+    "@babel/plugin-proposal-class-properties": "^7.5.5",
+    "@babel/plugin-proposal-decorators": "^7.6.0",
+    "@babel/plugin-transform-runtime": "^7.6.2",
+    "@babel/preset-env": "^7.6.2",
+    "@babel/runtime": "^7.6.2",
     "@pushrocks/early": "^3.0.3",
     "@pushrocks/smartcli": "^3.0.7",
+    "@pushrocks/smartfile": "^7.0.6",
     "@pushrocks/smartlog": "^2.0.19",
-    "@pushrocks/smartlog-destination-local": "^7.0.5",
-    "rollup": "^1.10.1",
+    "@pushrocks/smartlog-destination-local": "^8.0.2",
+    "@types/html-minifier": "^3.5.3",
+    "html-minifier": "^4.0.0",
+    "rollup": "^1.23.1",
     "rollup-plugin-babel": "^4.3.2",
-    "rollup-plugin-commonjs": "^9.3.4",
-    "rollup-plugin-node-resolve": "^4.2.3",
+    "rollup-plugin-commonjs": "^10.1.0",
+    "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-sourcemaps": "^0.4.2",
-    "rollup-plugin-terser": "^5.0.0",
-    "rollup-plugin-typescript2": "^0.21.0"
+    "rollup-plugin-terser": "^5.1.2",
+    "rollup-plugin-typescript2": "^0.24.3",
+    "terser": "4.3.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/html/index.html

@@ -0,0 +1,81 @@
+<!-- gitzone default -->
+<!-- made by Lossless GmbH -->
+<!-- checkout https://maintainedby.lossless.com for awesome OpenSource projects -->
+<html lang="en">
+  <head>
+    <!--Lets set some basic meta tags-->
+    <meta
+      name="viewport"
+      content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height"
+    />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+    <!--Lets make sure we recognize this as an PWA-->
+    <link rel="manifest" href="/manifest.json" />
+
+    <!--Lets make sure we support older browsers-->
+    <script src=" https://unpkg.com/@webcomponents/webcomponentsjs@^2/webcomponents-bundle.js"></script>
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
+
+    <!--Lets avoid a rescaling flicker due to default body margins-->
+    <style>
+      body {
+        margin: 0px;
+      }
+    </style>
+  </head>
+  <body>
+    <noscript>
+      <style>
+        @import url('https://fonts.googleapis.com/css?family=Roboto:300,400');
+        body {
+          background: #303f9f;
+          font-family: 'Roboto', sans-serif;
+          color: #ffffff;
+        }
+
+        a {
+          color: #ffffff;
+          text-decoration: none;
+        }
+        .container {
+          width: 600px;
+          margin: auto;
+          margin-top: 100px;
+          box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.3);
+          overflow: hidden;
+          border-radius: 3px;
+          background: #4357d9;
+        }
+        .header {
+          padding: 20px;
+          text-align: center;
+          font-size: 25px;
+          border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+        }
+        .content {
+          padding: 20px;
+        }
+        .footer {
+          padding: 10px;
+          text-align: center;
+        }
+      </style>
+      <div class="container">
+        <div class="header">
+          We need JavaScript to run properly!
+        </div>
+        <div class="content">
+          This site is being built using lit-element (made by Google). This technology works with
+          JavaScript. Subsequently this website does not work as intended by Lossless GmbH without
+          JavaScript.
+        </div>
+      </div>
+      <div class="footer">
+        <a href="https://lossless.gmbh">Legal Info</a> |
+        <a href="https://lossless.gmbh/privacy">Privacy Policy</a>
+      </div>
+    </noscript>
+  </body>
+  <script defer src="./bundle.js"></script>
+</html>

ts/index.ts

@@ -10,3 +10,6 @@ early.stop();
 if (process.env.CLI_CALL) {
   runCli();
 }
+
+// lets make this usable programmatically
+export * from './tsbundle.class.tsbundle';

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);
-    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);
-    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_web/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
       },
@@ -81,8 +50,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 +74,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);
+    await bundle.write(buildOptions.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 buildOptions = this.getOptionsProduction(fromArg, toArg);
+    const bundle = await plugins.rollup.rollup(buildOptions);
+    bundle.generate(buildOptions.output);
+    await bundle.write(buildOptions.output);
+    logger.log('ok', `Successfully bundled files!`);
+  }
 }

ts/tsbundle.cli.ts

@@ -1,20 +1,22 @@
 import * as plugins from './tsbundle.plugins';
 import { TsBundle } from './tsbundle.class.tsbundle';
+import { HtmlHandler } from './tsbundle.htmlhandler';
 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:
-        await tsbundle.buildProduction();
+      case argvArg.production || process.env.CI:
+        await tsbundle.buildProduction(argvArg.from, argvArg.to);
+        await htmlHandler.minifyHtml();
         break;
       case argvArg.test:
-        await tsbundle.buildTest();
-        break;
       default:
-        logger.log('error', `Can not determine build target environement. Please specify via --production or --test`)
+        await tsbundle.buildTest(argvArg.from, argvArg.to);
+        await htmlHandler.copyHtml();
         return;
     }
   });

ts/tsbundle.htmlhandler.ts

@@ -0,0 +1,38 @@
+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.distWebDir, 'index.html');
+
+  public async checkIfExists() {
+    return plugins.smartfile.fs.fileExists(this.sourceFilePath);
+  }
+
+  // copies the html
+  public async copyHtml() {
+    if (!(await this.checkIfExists())) {
+      return;
+    }
+    await plugins.smartfile.fs.copy(this.sourceFilePath, this.targetFilePath);
+  }
+
+  // copies and minifies the html
+  public async minifyHtml() {
+    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, this.targetFilePath);
+  }
+}

ts/tsbundle.paths.ts

@@ -0,0 +1,6 @@
+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');

ts/tsbundle.plugins.ts

@@ -1,9 +1,15 @@
+// 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';
 
-export { smartcli, smartlog, smartlogDestinationLocal };
+export { smartcli, smartfile, smartlog, smartlogDestinationLocal };
 
 // third party scope
 import * as rollup from 'rollup';
@@ -14,6 +20,8 @@ import rollupSourceMaps from 'rollup-plugin-sourcemaps';
 import { terser as rollupTerser } from 'rollup-plugin-terser';
 import rollupTypescript from 'rollup-plugin-typescript2';
 
+import * as htmlMinifier from 'html-minifier';
+
 export {
   rollup,
   rollupBabel,
@@ -21,5 +29,6 @@ export {
   rollupResolve,
   rollupSourceMaps,
   rollupTerser,
-  rollupTypescript
+  rollupTypescript,
+  htmlMinifier
 };