1.0.80

.gitlab-ci.yml

@@ -19,22 +19,36 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-snyk:
+auditProductionDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
+  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

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,52 @@
 {
   "name": "@gitzone/tsbundle",
-  "version": "1.0.57",
+  "version": "1.0.80",
   "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",
-    "build": "(tsbuild)",
+    "build": "(tsbuild --web)"
-    "format": "(gitzone format)"
   },
   "bin": {
     "tsbundle": "cli.js"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.20",
+    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tsrun": "^1.2.8",
+    "@gitzone/tsrun": "^1.2.12",
-    "@gitzone/tstest": "^1.0.28",
+    "@gitzone/tstest": "^1.0.52",
-    "@pushrocks/tapbundle": "^3.2.0",
+    "@pushrocks/tapbundle": "^3.2.14",
-    "tslint": "^6.1.0",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@babel/core": "^7.8.7",
+    "@babel/core": "^7.11.1",
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
-    "@babel/plugin-proposal-decorators": "^7.8.3",
+    "@babel/plugin-proposal-decorators": "^7.10.5",
-    "@babel/plugin-transform-runtime": "^7.8.3",
+    "@babel/plugin-transform-runtime": "^7.11.0",
-    "@babel/preset-env": "^7.8.7",
+    "@babel/preset-env": "^7.11.0",
-    "@babel/runtime": "^7.8.7",
+    "@babel/runtime": "^7.11.2",
-    "@pushrocks/early": "^3.0.3",
+    "@pushrocks/early": "^3.0.6",
-    "@pushrocks/smartcli": "^3.0.9",
+    "@pushrocks/smartcli": "^3.0.12",
-    "@pushrocks/smartfile": "^7.0.9",
+    "@pushrocks/smartfile": "^8.0.8",
-    "@pushrocks/smartlog": "^2.0.21",
+    "@pushrocks/smartlog": "^2.0.39",
-    "@pushrocks/smartlog-destination-local": "^8.0.2",
+    "@pushrocks/smartlog-destination-local": "^8.0.8",
-    "@rollup/plugin-commonjs": "^11.0.2",
+    "@pushrocks/smartparcel": "^1.0.9",
-    "@rollup/plugin-node-resolve": "^7.1.1",
+    "@rollup/plugin-commonjs": "^14.0.0",
-    "@rollup/plugin-typescript": "^4.0.0",
+    "@rollup/plugin-json": "^4.1.0",
-    "@types/html-minifier": "^3.5.3",
+    "@rollup/plugin-node-resolve": "^8.4.0",
-    "@types/node": "^13.9.1",
+    "@rollup/plugin-typescript": "^5.0.2",
+    "@types/html-minifier": "^4.0.0",
+    "@types/node": "^14.0.27",
     "html-minifier": "^4.0.0",
-    "rollup": "^2.0.6",
+    "rollup": "^2.23.1",
     "rollup-plugin-babel": "^4.4.0",
-    "rollup-plugin-sourcemaps": "^0.5.0",
+    "rollup-plugin-sourcemaps": "^0.6.2",
-    "rollup-plugin-terser": "^5.3.0",
+    "rollup-plugin-terser": "^6.1.0",
-    "terser": "^4.6.6"
+    "typescript": "^4.2.3"
   },
   "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)
+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
 

ts/tsbundle.class.tsbundle.ts

@@ -18,37 +18,38 @@ export class TsBundle {
         name: 'tsbundle',
         file: toArg,
         format: 'iife',
-        sourcemap: true
+        sourcemap: true,
       },
       // Indicate here external modules you don't wanna include in your bundle (i.e.: 'lodash')
       external: [],
       watch: {
-        include: ['src/**']
+        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'],
+          lib: ['esnext', 'dom', 'es2017.object'],
           noImplicitAny: false,
-          target: 'es2018'
+          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({
+        plugins.rollupCommonjs({}),
-          namedExports: {
-            'node_modules/@pushrocks/smartstate/dist/index.js': ['Smartstate']
-          }
-        }),
 
         // Resolve source maps to the original source
-        plugins.rollupSourceMaps()
+        plugins.rollupSourceMaps(),
         /*plugins.rollupBabel({
           runtimeHelpers: true,
           extensions: ['.js', '.jsx', '.ts', '.tsx'],
@@ -73,7 +74,7 @@ export class TsBundle {
             ]
           ]
         })*/
-      ]
+      ],
     };
     return baseOptions;
   }
@@ -87,8 +88,7 @@ export class TsBundle {
     productionOptions.plugins.push(
       plugins.rollupTerser({
         compress: true,
-        mangle: true,
+        mangle: true
-        sourcemap: true
       })
     );
     return productionOptions;
@@ -101,14 +101,26 @@ export class TsBundle {
   /**
    * creates a bundle for the test enviroment
    */
-  public async buildTest(fromArg: string, toArg: string) {
+  public async buildTest(
+    fromArg: string,
+    toArg: string,
+    bundlerArg: 'rollup' | 'parcel' = 'rollup'
+  ) {
     // create a bundle
-    logger.log('info', `bundling for TEST!`);
+    switch (bundlerArg) {
-    const buildOptions = this.getOptionsTest(fromArg, toArg);
+      case 'rollup':
-    const bundle = await plugins.rollup.rollup(buildOptions);
+        logger.log('info', `bundling for TEST!`);
-    bundle.generate(buildOptions.output as plugins.rollup.OutputOptions);
+        const buildOptions = this.getOptionsTest(fromArg, toArg);
-    await bundle.write(buildOptions.output as plugins.rollup.OutputOptions);
+        const bundle = await plugins.rollup.rollup(buildOptions);
-    logger.log('ok', `Successfully bundled files!`);
+        bundle.generate(buildOptions.output as plugins.rollup.OutputOptions);
+        await bundle.write(buildOptions.output as plugins.rollup.OutputOptions);
+        logger.log('ok', `Successfully bundled files!`);
+        break;
+      case 'parcel':
+        const parsedPath = plugins.path.parse(toArg);
+        const parcelInstance = new plugins.smartparcel.Parcel(fromArg, parsedPath.dir, parsedPath.base);
+        await parcelInstance.build();
+    }
   }
 
   /**

ts/tsbundle.cli.ts

@@ -37,6 +37,22 @@ export const runCli = async () => {
     }
   });
 
+  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('./ts/index.ts', './dist_bundle/bundle.js');
+        // await htmlHandler.minifyHtml();
+        break;
+      case argvArg.test:
+      default:
+        await tsbundle.buildTest('./ts/index.ts', './dist_bundle/bundle.js');
+        // await htmlHandler.copyHtml();
+        return;
+    }
+  });
+
   tsBundleCli.addCommand('website').subscribe(async argvArg => {
     const tsbundle = new TsBundle();
     const htmlHandler = new HtmlHandler();

ts/tsbundle.plugins.ts

@@ -8,13 +8,15 @@ 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';
 
-export { smartcli, smartfile, smartlog, smartlogDestinationLocal };
+export { smartcli, smartfile, smartlog, smartlogDestinationLocal, smartparcel };
 
 // 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 +28,7 @@ export {
   rollup,
   rollupBabel,
   rollupCommonjs,
+  rollupJson,
   rollupResolve,
   rollupSourceMaps,
   rollupTerser,