1.0.67

.gitlab-ci.yml

@@ -24,13 +24,14 @@ mirror:
     - docker
     - notpriv
 
-snyk:
+audit:
-  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 --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high
   tags:
     - lossless
     - docker

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,10 +1,10 @@
 {
   "name": "@gitzone/tsbundle",
-  "version": "1.0.57",
+  "version": "1.0.67",
   "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": {
@@ -16,36 +16,36 @@
     "tsbundle": "cli.js"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.20",
+    "@gitzone/tsbuild": "^2.1.24",
     "@gitzone/tsrun": "^1.2.8",
     "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.2.0",
+    "@pushrocks/tapbundle": "^3.2.1",
-    "tslint": "^6.1.0",
+    "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@babel/core": "^7.8.7",
+    "@babel/core": "^7.9.6",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
     "@babel/plugin-proposal-decorators": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.8.3",
+    "@babel/plugin-transform-runtime": "^7.9.6",
-    "@babel/preset-env": "^7.8.7",
+    "@babel/preset-env": "^7.9.6",
-    "@babel/runtime": "^7.8.7",
+    "@babel/runtime": "^7.9.6",
     "@pushrocks/early": "^3.0.3",
-    "@pushrocks/smartcli": "^3.0.9",
+    "@pushrocks/smartcli": "^3.0.11",
-    "@pushrocks/smartfile": "^7.0.9",
+    "@pushrocks/smartfile": "^7.0.12",
     "@pushrocks/smartlog": "^2.0.21",
     "@pushrocks/smartlog-destination-local": "^8.0.2",
-    "@rollup/plugin-commonjs": "^11.0.2",
+    "@rollup/plugin-commonjs": "^12.0.0",
-    "@rollup/plugin-node-resolve": "^7.1.1",
+    "@rollup/plugin-node-resolve": "^8.0.0",
-    "@rollup/plugin-typescript": "^4.0.0",
+    "@rollup/plugin-typescript": "^4.1.2",
     "@types/html-minifier": "^3.5.3",
-    "@types/node": "^13.9.1",
+    "@types/node": "^14.0.5",
     "html-minifier": "^4.0.0",
-    "rollup": "^2.0.6",
+    "rollup": "^2.10.9",
     "rollup-plugin-babel": "^4.4.0",
-    "rollup-plugin-sourcemaps": "^0.5.0",
+    "rollup-plugin-sourcemaps": "^0.6.2",
     "rollup-plugin-terser": "^5.3.0",
-    "terser": "^4.6.6"
+    "terser": "^4.7.0"
   },
   "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

@@ -28,24 +28,22 @@ export class TsBundle {
       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
         }),
         // 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()

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();