fix(core): update

.gitlab-ci.yml

@@ -12,6 +12,9 @@ stages:
   - release
   - metadata
 
+before_script:
+  - npm install -g @shipzone/npmci
+
 # ====================
 # security stage
 # ====================

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
+      "command": "npm test",
-      "type": "node",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
+      "type": "node-terminal"
-        "${relativeFile}"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
-    },
-    {
-      "name": "test.ts",
-      "type": "node",
-      "request": "launch",
-      "args": [
-        "test/test.ts"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
     }
   ]
 }

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

cli.child.ts

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+process.env.CLI_CALL = 'true';
+import * as cliTool from './ts/index.js';
+cliTool.runCli();

cli.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
-const cliTool = require('./dist_ts/index');
+const cliTool = await import('./dist_ts/index.js');
 cliTool.runCli();

cli.ts.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
-require('@gitzone/tsrun');
+
-const cliTool = require('./ts/index');
+import * as tsrun from '@gitzone/tsrun';
-cliTool.runCli();
+tsrun.runPath('./cli.child.js', import.meta.url);

npmextra.json

@@ -5,7 +5,7 @@
       "githost": "gitlab.com",
       "gitscope": "gitzone",
       "gitrepo": "tsbundle",
-      "shortDescription": "a bundler using rollup for painless bundling of web projects",
+      "description": "a bundler using rollup for painless bundling of web projects",
       "npmPackagename": "@gitzone/tsbundle",
       "license": "MIT",
       "projectDomain": "git.zone"

package.json

@@ -5,6 +5,7 @@
   "description": "a bundler using rollup for painless bundling of web projects",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
@@ -15,10 +16,10 @@
     "tsbundle": "cli.js"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.29",
+    "@gitzone/tsbuild": "^2.1.48",
-    "@gitzone/tsrun": "^1.2.18",
+    "@gitzone/tsrun": "^1.2.31",
-    "@gitzone/tstest": "^1.0.64",
+    "@gitzone/tstest": "^1.0.67",
-    "@pushrocks/tapbundle": "^4.0.8",
+    "@pushrocks/tapbundle": "^5.0.2",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
@@ -31,10 +32,11 @@
     "@babel/runtime": "^7.17.2",
     "@pushrocks/early": "^3.0.6",
     "@pushrocks/smartcli": "^3.0.14",
-    "@pushrocks/smartfile": "^9.0.5",
+    "@pushrocks/smartfile": "^9.0.6",
     "@pushrocks/smartlog": "^2.0.44",
     "@pushrocks/smartlog-destination-local": "^8.0.8",
     "@pushrocks/smartparcel": "^1.0.13",
+    "@pushrocks/smartpath": "^5.0.4",
     "@pushrocks/smartpromise": "^3.1.7",
     "@pushrocks/smartspawn": "^2.0.9",
     "@rollup/plugin-commonjs": "^21.0.2",
@@ -44,11 +46,11 @@
     "@types/html-minifier": "^4.0.2",
     "@types/node": "^17.0.21",
     "html-minifier": "^4.0.0",
-    "rollup": "^2.70.0",
+    "rollup": "^2.70.1",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-sourcemaps": "^0.6.3",
     "rollup-plugin-terser": "^7.0.2",
-    "typescript": "^4.6.2"
+    "typescript": "4.7.0"
   },
   "files": [
     "ts/**/*",
@@ -61,5 +63,8 @@
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -8,13 +8,20 @@ a bundler using rollup for painless bundling of web projects
 * [docs (typedoc)](https://gitzone.gitlab.io/tsbundle/)
 
 ## Status for master
-[![pipeline status](https://gitlab.com/gitzone/tsbundle/badges/master/pipeline.svg)](https://gitlab.com/gitzone/tsbundle/commits/master)
+
-[![coverage report](https://gitlab.com/gitzone/tsbundle/badges/master/coverage.svg)](https://gitlab.com/gitzone/tsbundle/commits/master)
+Status Category | Status Badge
-[![npm downloads per month](https://img.shields.io/npm/dm/@gitzone/tsbundle.svg)](https://www.npmjs.com/package/@gitzone/tsbundle)
+-- | --
-[![Known Vulnerabilities](https://snyk.io/test/npm/@gitzone/tsbundle/badge.svg)](https://snyk.io/test/npm/@gitzone/tsbundle)
+GitLab Pipelines | [![pipeline status](https://gitlab.com/gitzone/tsbundle/badges/master/pipeline.svg)](https://lossless.cloud)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/gitzone/tsbundle/badges/master/coverage.svg)](https://lossless.cloud)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@gitzone/tsbundle)](https://lossless.cloud)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/gitzone/tsbundle)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@gitzone/tsbundle)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@gitzone/tsbundle)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@gitzone/tsbundle)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
@@ -44,6 +51,7 @@ tsbundle --from="./ts/index.ts" --to="dist/bundle.js"
 ```
 
 ## API
+
 You are using TypeScript, aren't you? Most of the stuff is apparent from the IDE intellisense.
 
 ```typescript
@@ -52,10 +60,10 @@ import { TsBundle } from '@gitozne/tsbundle';
 const myTsBundleInstance = new TsBundle();
 
 const run = async () => {
-  await myTsBundleInstance.buildTest('./from/my.ts', './to/mybundle.js')
+  await myTsBundleInstance.buildTest('./from/my.ts', './to/mybundle.js');
   // OR
-  await myTsBundleInstance.buildProduction('./from/my.ts', './to/mybundle.js')
+  await myTsBundleInstance.buildProduction('./from/my.ts', './to/mybundle.js');
-}
+};
 ```
 
 ## Contribution

test/test.ts

@@ -1,16 +1,25 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import * as tsbundle from '../dist_ts/index';
+import * as tsbundle from '../dist_ts/index.js';
 
 import * as path from 'path';
 
 tap.test('should bundle test', async () => {
   const tsbundleInstance = new tsbundle.TsBundle();
-  await tsbundleInstance.buildTest(process.cwd() + '/test', './ts_web/index.ts', './dist_manual/test.js', 'rollup')
+  await tsbundleInstance.buildTest(
-})
+    process.cwd() + '/test',
+    './ts_web/index.ts',
+    './dist_manual/test.js',
+    'rollup'
+  );
+});
 
 tap.test('should bundle production', async () => {
   const tsbundleInstance = new tsbundle.TsBundle();
-  await tsbundleInstance.buildProduction(process.cwd(), './test/ts_web/index.ts', './test/dist_manual/production.js')
+  await tsbundleInstance.buildProduction(
-})
+    process.cwd(),
+    './test/ts_web/index.ts',
+    './test/dist_manual/production.js'
+  );
+});
 
 tap.start();

test/ts_web/index.ts

@@ -7,7 +7,7 @@ function sealed(constructor: Function) {
 
 @sealed
 class BugReport {
-  type = "report";
+  type = 'report';
   title: string;
 
   constructor(t: string) {

ts/index.ts

@@ -1,13 +1,13 @@
 import * as early from '@pushrocks/early';
 early.start('tsbundle');
 // lets import all plugins beforehand
-import './tsbundle.plugins';
+import './tsbundle.plugins.js';
 
-import { logger } from './tsbundle.logging';
+import { logger } from './tsbundle.logging.js';
-import { runCli } from './tsbundle.cli';
+import { runCli } from './tsbundle.cli.js';
 early.stop();
 
 // lets make this usable programmatically
-export * from './tsbundle.class.tsbundle';
+export * from './tsbundle.class.tsbundle.js';
-export * from './tsbundle.htmlhandler';
+export * from './tsbundle.htmlhandler.js';
 export { runCli };

ts/tsbundle.class.tsbundle.ts

@@ -1,41 +1,54 @@
-import * as plugins from './tsbundle.plugins';
+import * as plugins from './tsbundle.plugins.js';
-import { logger } from './tsbundle.logging';
+import { logger } from './tsbundle.logging.js';
 
 export class TsBundle {
-  public async buildTest(cwdArg: string, fromArg: string, toArg: string, bundlerArg: 'rollup' | 'parcel') {
+  public async buildTest(
+    cwdArg: string,
+    fromArg: string,
+    toArg: string,
+    bundlerArg: 'rollup' | 'parcel'
+  ) {
     const done = plugins.smartpromise.defer();
-    const threadsimple = new plugins.smartspawn.ThreadSimple(plugins.path.join(__dirname, './tsbundle.class.tsbundleprocess.js'), [], {
+    const threadsimple = new plugins.smartspawn.ThreadSimple(
+      plugins.path.join(plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url), './tsbundle.class.tsbundleprocess.js'),
+      [],
+      {
         env: {
           ...process.env,
           tsbundleMode: 'test',
           tsbundleCwd: cwdArg,
           tsbundleFrom: fromArg,
           tsbundleTo: toArg,
-        tsbundleBundler: bundlerArg
+          tsbundleBundler: bundlerArg,
+        },
       }
-    })
+    );
     const childProcess = await threadsimple.start();
     childProcess.on('exit', (status) => {
       done.resolve();
-    })
+    });
     await done.promise;
-  };
+  }
 
   public async buildProduction(cwdArg: string, fromArg: string, toArg: string) {
     const done = plugins.smartpromise.defer();
-    const threadsimple = new plugins.smartspawn.ThreadSimple(plugins.path.join(__dirname, './tsbundle.class.tsbundleprocess.js'), [], {
+    const threadsimple = new plugins.smartspawn.ThreadSimple(
+      plugins.path.join(plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url), './tsbundle.class.tsbundleprocess.js'),
+      [],
+      {
         env: {
           ...process.env,
           tsbundleMode: 'production',
           tsbundleCwd: cwdArg,
           tsbundleFrom: fromArg,
-        tsbundleTo: toArg
+          tsbundleTo: toArg,
+        },
       }
-    })
+    );
     const childProcess = await threadsimple.start();
     childProcess.on('exit', (status) => {
       done.resolve();
-    })
+    });
     await done.promise;
-  };
+  }
 }

ts/tsbundle.class.tsbundleprocess.ts

@@ -1,5 +1,5 @@
-import * as plugins from './tsbundle.plugins';
+import * as plugins from './tsbundle.plugins.js';
-import { logger } from './tsbundle.logging';
+import { logger } from './tsbundle.logging.js';
 
 export class TsBundleProcess {
   /**
@@ -27,7 +27,7 @@ export class TsBundleProcess {
       },
       plugins: [
         // Compile TypeScript files
-        plugins.rollupTypescript({
+        (plugins.rollupTypescript as any)({
           include: plugins.path.parse(fromArg).dir
             ? plugins.path.parse(fromArg).dir + '/**/*.ts'
             : '**/*.ts',
@@ -36,21 +36,21 @@ export class TsBundleProcess {
           experimentalDecorators: true,
           inlineSourceMap: true,
           noEmitOnError: true,
-          lib: ['esnext', 'dom', 'es2017.object'],
+          lib: ['dom'],
           noImplicitAny: false,
-          target: 'es2018',
+          target: 'es2020',
           allowSyntheticDefaultImports: true,
           importsNotUsedAsValues: 'preserve',
         }),
-        plugins.rollupJson(),
+        (plugins.rollupJson as any)(),
         // 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 as any)({}),
 
         // Resolve source maps to the original source
-        plugins.rollupSourceMaps()
+        plugins.rollupSourceMaps(),
       ],
     };
     return baseOptions;
@@ -65,7 +65,7 @@ export class TsBundleProcess {
     productionOptions.plugins.push(
       plugins.rollupTerser({
         compress: true,
-        mangle: true
+        mangle: true,
       })
     );
     return productionOptions;
@@ -95,7 +95,11 @@ export class TsBundleProcess {
         process.exit(0);
       case 'parcel':
         const parsedPath = plugins.path.parse(toArg);
-        const parcelInstance = new plugins.smartparcel.Parcel(fromArg, parsedPath.dir, parsedPath.base);
+        const parcelInstance = new plugins.smartparcel.Parcel(
+          fromArg,
+          parsedPath.dir,
+          parsedPath.base
+        );
         await parcelInstance.build();
     }
   }
@@ -122,13 +126,17 @@ const run = async () => {
   console.log(`to: ${process.env.tsbundleTo}`);
   console.log(`mode: ${process.env.tsbundleMode}`);
   process.chdir(process.env.tsbundleCwd);
-  console.log(`switched to ${process.cwd()}`)
+  console.log(`switched to ${process.cwd()}`);
   const tsbundleProcessInstance = new TsBundleProcess();
   if (process.env.tsbundleMode === 'test') {
-    tsbundleProcessInstance.buildTest(process.env.tsbundleFrom, process.env.tsbundleTo, process.env.tsbundleBundler as 'rollup' | 'parcel');
+    tsbundleProcessInstance.buildTest(
+      process.env.tsbundleFrom,
+      process.env.tsbundleTo,
+      process.env.tsbundleBundler as 'rollup' | 'parcel'
+    );
   } else {
     tsbundleProcessInstance.buildProduction(process.env.tsbundleFrom, process.env.tsbundleTo);
   }
-}
+};
 
 run();

ts/tsbundle.cli.ts

@@ -1,11 +1,11 @@
-import * as plugins from './tsbundle.plugins';
+import * as plugins from './tsbundle.plugins.js';
-import { TsBundle } from './tsbundle.class.tsbundle';
+import { TsBundle } from './tsbundle.class.tsbundle.js';
-import { HtmlHandler } from './tsbundle.htmlhandler';
+import { HtmlHandler } from './tsbundle.htmlhandler.js';
-import { logger } from './tsbundle.logging';
+import { logger } from './tsbundle.logging.js';
 
 export const runCli = async () => {
   const tsBundleCli = new plugins.smartcli.Smartcli();
-  tsBundleCli.standardTask().subscribe(async argvArg => {
+  tsBundleCli.standardTask().subscribe(async (argvArg) => {
     const tsbundle = new TsBundle();
     // const htmlHandler = new HtmlHandler();
     switch (true) {
@@ -21,23 +21,32 @@ export const runCli = async () => {
     }
   });
 
-  tsBundleCli.addCommand('element').subscribe(async argvArg => {
+  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(process.cwd(), './ts_web/index.ts', './dist_bundle/bundle.js');
+        await tsbundle.buildProduction(
+          process.cwd(),
+          './ts_web/index.ts',
+          './dist_bundle/bundle.js'
+        );
         // await htmlHandler.minifyHtml();
         break;
       case argvArg.test:
       default:
-        await tsbundle.buildTest(process.cwd(), './ts_web/index.ts', './dist_bundle/bundle.js', 'rollup');
+        await tsbundle.buildTest(
+          process.cwd(),
+          './ts_web/index.ts',
+          './dist_bundle/bundle.js',
+          'rollup'
+        );
         // await htmlHandler.copyHtml();
         return;
     }
   });
 
-  tsBundleCli.addCommand('npm').subscribe(async argvArg => {
+  tsBundleCli.addCommand('npm').subscribe(async (argvArg) => {
     const tsbundle = new TsBundle();
     // const htmlHandler = new HtmlHandler();
     switch (true) {
@@ -47,23 +56,37 @@ export const runCli = async () => {
         break;
       case argvArg.test:
       default:
-        await tsbundle.buildTest(process.cwd(), './ts/index.ts', './dist_bundle/bundle.js', 'rollup');
+        await tsbundle.buildTest(
+          process.cwd(),
+          './ts/index.ts',
+          './dist_bundle/bundle.js',
+          'rollup'
+        );
         // await htmlHandler.copyHtml();
         return;
     }
   });
 
-  tsBundleCli.addCommand('website').subscribe(async argvArg => {
+  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(process.cwd(), './ts_web/index.ts', './dist_serve/bundle.js');
+        await tsbundle.buildProduction(
+          process.cwd(),
+          './ts_web/index.ts',
+          './dist_serve/bundle.js'
+        );
         await htmlHandler.minifyHtml();
         break;
       case argvArg.test:
       default:
-        await tsbundle.buildTest(process.cwd(), './ts_web/index.ts', './dist_serve/bundle.js', 'rollup');
+        await tsbundle.buildTest(
+          process.cwd(),
+          './ts_web/index.ts',
+          './dist_serve/bundle.js',
+          'rollup'
+        );
         await htmlHandler.copyHtml();
         return;
     }

ts/tsbundle.htmlhandler.ts

@@ -1,5 +1,5 @@
-import * as plugins from './tsbundle.plugins';
+import * as plugins from './tsbundle.plugins.js';
-import * as paths from './tsbundle.paths';
+import * as paths from './tsbundle.paths.js';
 
 export class HtmlHandler {
   public sourceFilePath: string = plugins.path.join(paths.htmlDir, 'index.html');
@@ -31,7 +31,7 @@ export class HtmlHandler {
       removeAttributeQuotes: true,
       collapseWhitespace: true,
       collapseInlineTagWhitespace: true,
-      removeComments: true
+      removeComments: true,
     });
     plugins.smartfile.memory.toFsSync(minifiedHtml, targetPathArg);
   }

ts/tsbundle.logging.ts

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

ts/tsbundle.paths.ts

@@ -1,7 +1,10 @@
-import * as plugins from './tsbundle.plugins';
+import * as plugins from './tsbundle.plugins.js';
 
 export const cwd = process.cwd();
-export const packageDir = plugins.path.join(__dirname, '../');
+export const packageDir = plugins.path.join(
+  plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),
+  '../'
+);
 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

@@ -8,11 +8,21 @@ 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 smartpath from '@pushrocks/smartpath';
 import * as smartparcel from '@pushrocks/smartparcel';
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartspawn from '@pushrocks/smartspawn';
 
-export { smartcli, smartfile, smartlog, smartlogDestinationLocal, smartparcel, smartpromise, smartspawn };
+export {
+  smartcli,
+  smartfile,
+  smartlog,
+  smartlogDestinationLocal,
+  smartpath,
+  smartparcel,
+  smartpromise,
+  smartspawn,
+};
 
 // third party scope
 import * as rollup from 'rollup';
@@ -35,5 +45,5 @@ export {
   rollupSourceMaps,
   rollupTerser,
   rollupTypescript,
-  htmlMinifier
+  htmlMinifier,
 };

tsconfig.json

@@ -1,5 +1,8 @@
 {
   "compilerOptions": {
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "target": "ES2020",
+    "module": "ES2020",
+    "moduleResolution": "node12",
   }
 }