1.0.56

.gitignore

@@ -8,13 +8,15 @@ pages/
 # installs
 node_modules/
 
-# caches and builds
+# caches
 .yarn/
 .cache/
+.rpt2_cache
+
+# builds
 dist/
 dist_web/
 dist_serve/
 dist_ts_web/
 
-# custom
-.rpt2_cache
+# custom

.gitlab-ci.yml

@@ -1,5 +1,7 @@
-# gitzone standard
-image: hosttoday/ht-docker-node:npmci
+# gitzone ci_default
+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
@@ -78,19 +80,11 @@ release:
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SOURCE_CODE="$PWD"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
+    - npmci command npm install -g tslint typescript
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
   - docker
   - priv
@@ -106,13 +100,15 @@ 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 typedoc typescript
+    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
     - docker
     - notpriv

.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.17",
+  "version": "1.0.56",
   "private": false,
   "description": "a bundler using rollup for painless bundling of web projects",
   "main": "dist/index.js",
@@ -8,7 +8,7 @@
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
-    "test": "cd test && node ../cli.ts.js",
+    "test": "cd test && node ../cli.ts.js --production",
     "build": "(tsbuild)",
     "format": "(gitzone format)"
   },
@@ -16,26 +16,46 @@
     "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/preset-env": "^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",
-    "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-typescript2": "^0.21.0"
-  }
+    "@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": "^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"
+  ]
 }

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>

test/test.ts

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

ts/index.ts

@@ -1,60 +1,15 @@
-import * as plugins from './tsbundle.plugins';
+import * as early from '@pushrocks/early';
+early.start('tsbundle');
+// lets import all plugins beforehand
+import './tsbundle.plugins';
 
-const rollupOptions: plugins.rollup.RollupOptions = {
-  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: [
-    // Compile TypeScript files
-    plugins.rollupTypescript({
-      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
-    plugins.rollupResolve(),
-    plugins.rollupCommonjs({
-      namedExports: {
-        'node_modules/@pushrocks/smartstate/dist/index.js': ['Smartstate']
-      }
-    }),
+import { logger } from './tsbundle.logging';
+import { runCli } from './tsbundle.cli';
+early.stop();
 
-    // Resolve source maps to the original source
-    plugins.rollupSourceMaps(),
-    plugins.rollupBabel({
-      extensions: ['.js', '.jsx', '.ts', '.tsx'],
-      babelrc: false,
-      presets: [['@babel/preset-env', { modules: false }]]
-    })
-  ]
+// lets make this usable programmatically
+export * from './tsbundle.class.tsbundle';
+export * from './tsbundle.htmlhandler';
+export {
+  runCli
 };
-
-async function build() {
-  // create a bundle
-  const bundle = await plugins.rollup.rollup(rollupOptions);
-  bundle.generate(rollupOptions.output);
-  bundle.write(rollupOptions.output);
-}
-
-build();

ts/tsbundle.class.tsbundle.ts

@@ -0,0 +1,121 @@
+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!`);
+  }
+}

ts/tsbundle.cli.ts

@@ -0,0 +1,57 @@
+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 || 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 || process.env.CI:
+        await tsbundle.buildProduction('./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 htmlHandler.copyHtml();
+        return;
+    }
+  });
+
+  tsBundleCli.startParse();
+};

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.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

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

ts/tsbundle.paths.ts

@@ -0,0 +1,7 @@
+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,9 +1,26 @@
+// 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, 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 rollupTypescript from 'rollup-plugin-typescript2';
+import { terser as rollupTerser } from 'rollup-plugin-terser';
+import rollupTypescript from '@rollup/plugin-typescript';
+
+import * as htmlMinifier from 'html-minifier';
 
 export {
   rollup,
@@ -11,5 +28,7 @@ export {
   rollupCommonjs,
   rollupResolve,
   rollupSourceMaps,
+  rollupTerser,
   rollupTypescript,
-};
+  htmlMinifier
+};

ts/tsbundle.rollup.prepend.ts

@@ -1 +0,0 @@
-import * as plugins from './tsbundle.plugins';