.gitlab-ci.yml

@@ -0,0 +1,141 @@
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+
+cache:
+  paths:
+    - .npmci_cache/
+  key: '$CI_BUILD_STAGE'
+
+stages:
+  - security
+  - test
+  - release
+  - metadata
+
+before_script:
+  - npm install -g @shipzone/npmci
+
+# ====================
+# security stage
+# ====================
+mirror:
+  stage: security
+  script:
+    - npmci git mirror
+  only:
+    - tags
+  tags:
+    - lossless
+    - docker
+    - notpriv
+
+auditProductionDependencies:
+  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 npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
+  tags:
+    - docker
+  allow_failure: true
+
+# ====================
+# test stage
+# ====================
+
+testStable:
+  stage: test
+  script:
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+    - docker
+
+testBuild:
+  stage: test
+  script:
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+    - docker
+
+release:
+  stage: release
+  script:
+    - npmci node install stable
+    - npmci npm publish
+  only:
+    - tags
+  tags:
+    - lossless
+    - docker
+    - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  allow_failure: true
+  only:
+    - tags
+  script:
+    - npmci command npm install -g tslint typescript
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
+  tags:
+    - lossless
+    - docker
+    - priv
+
+trigger:
+  stage: metadata
+  script:
+    - npmci trigger
+  only:
+    - tags
+  tags:
+    - lossless
+    - docker
+    - notpriv
+
+pages:
+  stage: metadata
+  script:
+    - npmci node install lts
+    - npmci command npm install -g @gitzone/tsdoc
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command tsdoc
+  tags:
+    - lossless
+    - docker
+    - notpriv
+  only:
+    - tags
+  artifacts:
+    expire_in: 1 week
+    paths:
+      - public
+  allow_failure: true

changelog.md

@@ -1,64 +0,0 @@
-# Changelog
-
-## 2025-01-29 - 2.2.5 - fix(mod_assets)
-Fix async handling in asset processing
-
-- Ensured that the empty directory operation is awaited in the asset processing workflow.
-
-## 2025-01-29 - 2.2.4 - fix(mod_assets)
-Fix logging message in ensureAssetsDir to correctly state when directory is created
-
-- Corrected logging output in ensureAssetsDir method to indicate directory creation.
-
-## 2025-01-29 - 2.2.3 - fix(mod_assets)
-Fix issue with asset directory copy
-
-- Updated dependency '@push.rocks/smartfile' to version '^11.2.0'
-- Ensure target directory is properly replaced when copying assets
-
-## 2025-01-29 - 2.2.2 - fix(dependencies)
-Update smartfile dependency and fix spacing issue in assets module
-
-- Updated @push.rocks/smartfile from ^11.1.6 to ^11.1.8
-- Fixed a spacing issue in the processAssets function within the assets module
-
-## 2025-01-29 - 2.2.1 - fix(index)
-Export mod_assets for programmatic use
-
-- Added export for mod_assets/index in ts/index.ts to make it usable programmatically.
-
-## 2025-01-29 - 2.2.0 - feat(AssetsHandler)
-Add asset handling to the CLI workflow
-
-- Introduced AssetsHandler class for managing asset directories and files.
-- Updated tsbundle.cli.ts to include asset processing in the 'website' command.
-
-## 2025-01-28 - 2.1.1 - fix(core)
-Update dependencies and remove GitLab CI configuration.
-
-- Updated several devDependencies to newer versions for improved stability and performance.
-- Updated core dependencies including esbuild and TypeScript.
-- Removed the .gitlab-ci.yml file, which could suggest a change in continuous integration setup.
-
-## 2024-10-27 - 2.1.0 - feat(mod_esbuild)
-Add alias support to esbuild bundling process
-
-- Updated dependencies in package.json to latest versions.
-- Improved build process by adding alias resolution based on tsconfig.json settings in esbuild.
-
-## 2022-05-04 - 2.0.0-2.0.1 - Breaking and Fix Changes
-Released version 2.0.0 with breaking changes and subsequent fixes.
-
-- BREAKING CHANGE(core): Removed parcel and rollup
-- fix(core): Addressed initial issues in new major version
-
-## 2023-10-03 - 2.0.10 - Fix Updates
-Ongoing updates and improvements.
-
-- fix(core): General updates and enhancements
-
-## 2024-01-10 - 2.0.11-2.0.15 - Minor Fixes
-Cumulative fixes and updates from recent releases.
-
-- fix(core): Continuous improvement cycle across versions
-

cli.ts.js

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

npmextra.json

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

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@git.zone/tsbundle",
+  "name": "@gitzone/tsbundle",
-  "version": "2.2.5",
+  "version": "2.0.8",
   "private": false,
   "description": "a bundler using rollup for painless bundling of web projects",
   "main": "dist_ts/index.js",
@@ -16,26 +16,25 @@
     "tsbundle": "cli.js"
   },
   "devDependencies": {
-    "@git.zone/tsbuild": "^2.2.1",
+    "@gitzone/tsbuild": "^2.1.66",
-    "@git.zone/tsrun": "^1.3.3",
+    "@gitzone/tsrun": "^1.2.42",
-    "@git.zone/tstest": "^1.0.96",
+    "@gitzone/tstest": "^1.0.74",
-    "@push.rocks/tapbundle": "^5.5.6",
+    "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^22.12.0"
+    "@types/node": "^20.2.5"
   },
   "dependencies": {
-    "@push.rocks/early": "^4.0.4",
+    "@pushrocks/early": "^4.0.3",
-    "@push.rocks/smartcli": "^4.0.11",
+    "@pushrocks/smartcli": "^4.0.6",
-    "@push.rocks/smartdelay": "^3.0.5",
+    "@pushrocks/smartfile": "^10.0.7",
-    "@push.rocks/smartfile": "^11.2.0",
+    "@pushrocks/smartlog": "^3.0.2",
-    "@push.rocks/smartlog": "^3.0.7",
+    "@pushrocks/smartlog-destination-local": "^9.0.0",
-    "@push.rocks/smartlog-destination-local": "^9.0.2",
+    "@pushrocks/smartpath": "^5.0.5",
-    "@push.rocks/smartpath": "^5.0.18",
+    "@pushrocks/smartpromise": "^4.0.2",
-    "@push.rocks/smartpromise": "^4.2.2",
+    "@pushrocks/smartspawn": "^3.0.2",
-    "@push.rocks/smartspawn": "^3.0.3",
+    "@types/html-minifier": "^4.0.2",
-    "@types/html-minifier": "^4.0.5",
+    "esbuild": "^0.17.19",
-    "esbuild": "^0.24.2",
     "html-minifier": "^4.0.0",
-    "typescript": "5.7.3"
+    "typescript": "^5.1.3"
   },
   "files": [
     "ts/**/*",

readme.md

@@ -1,8 +1,8 @@
-# @git.zone/tsbundle
+# @gitzone/tsbundle
 a bundler using rollup for painless bundling of web projects
 
 ## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@git.zone/tsbundle)
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@gitzone/tsbundle)
 * [gitlab.com (source)](https://gitlab.com/gitzone/tsbundle)
 * [github.com (source mirror)](https://github.com/gitzone/tsbundle)
 * [docs (typedoc)](https://gitzone.gitlab.io/tsbundle/)
@@ -13,14 +13,14 @@ Status Category | Status Badge
 -- | --
 GitLab Pipelines | [![pipeline status](https://gitlab.com/gitzone/tsbundle/badges/master/pipeline.svg)](https://lossless.cloud)
 GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/gitzone/tsbundle/badges/master/coverage.svg)](https://lossless.cloud)
-npm | [![npm downloads per month](https://badgen.net/npm/dy/@git.zone/tsbundle)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@gitzone/tsbundle)](https://lossless.cloud)
 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/@git.zone/tsbundle)](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/@git.zone/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/@git.zone/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
@@ -38,10 +38,10 @@ tsbundle supports two modes of usage: CLI and API usage.
 # Install the tool for cli usage
 
 # Globally
-npm install -g @git.zone/tsbundle
+npm install -g @gitzone/tsbundle
 
 # Locally for use in your pacakge.json
-npm install --save-dev @git.zone/tsbundle
+npm install --save-dev @gitzone/tsbundle
 
 # then use it
 tsbundle --from="./ts/index.ts" --to="dist/bundle.js"

test/test.ts

@@ -1,4 +1,4 @@
-import { expect, tap } from '@push.rocks/tapbundle';
+import { expect, tap } from '@pushrocks/tapbundle';
 import * as tsbundle from '../ts/index.js';
 
 tap.test('should bundle with esbuild', async () => {

test/ts_web/index.ts

@@ -1,9 +1,5 @@
-import * as smartdelay from '@push.rocks/smartdelay';
-
 const myConst: string = 'hello';
 
-await smartdelay.delayFor(1000);
-
 function sealed(constructor: Function) {
   Object.seal(constructor);
   Object.seal(constructor.prototype);
@@ -19,6 +15,4 @@ class BugReport {
   }
 }
 
-
-
 console.log(myConst);

ts/00_commitinfo_data.ts

@@ -1,8 +1,8 @@
 /**
- * autocreated commitinfo by @push.rocks/commitinfo
+ * autocreated commitinfo by @pushrocks/commitinfo
  */
 export const commitinfo = {
-  name: '@git.zone/tsbundle',
+  name: '@gitzone/tsbundle',
-  version: '2.2.5',
+  version: '2.0.8',
   description: 'a bundler using rollup for painless bundling of web projects'
 }

ts/index.ts

@@ -1,4 +1,4 @@
-import * as early from '@push.rocks/early';
+import * as early from '@pushrocks/early';
 early.start('tsbundle');
 // lets import all plugins beforehand
 import './plugins.js';
@@ -9,6 +9,5 @@ early.stop();
 
 // lets make this usable programmatically
 export * from './tsbundle.class.tsbundle.js';
-export * from './mod_assets/index.js';
 export * from './mod_html/index.js';
 export { runCli };

ts/mod_assets/index.ts

@@ -1,40 +0,0 @@
-import * as plugins from './plugins.js';
-import * as paths from '../paths.js';
-
-export class AssetsHandler {
-  public defaultFromDirPath: string = plugins.path.join(paths.cwd, './assets');
-  public defaultToDirPath: string = plugins.path.join(paths.cwd, './dist_serve/assets');
-
-  public async ensureAssetsDir() {
-    const assetsDirExists = await plugins.smartfile.fs.isDirectory(this.defaultFromDirPath);
-    if (!assetsDirExists) {
-      await plugins.smartfile.fs.ensureDir(this.defaultFromDirPath);
-      console.log(`created assets directory at ${this.defaultFromDirPath}`);
-    }
-  }
-
-  // copies the html
-  public async processAssets(optionsArg?: {
-    from?: string;
-    to?: string;
-  }) {
-    // lets assemble the options
-    optionsArg = {
-      ... {
-        from: this.defaultFromDirPath,
-        to: this.defaultToDirPath,
-      },
-      ...(optionsArg || {})
-    }
-    await this.ensureAssetsDir()
-    optionsArg.from = plugins.smartpath.transform.toAbsolute(optionsArg.from, paths.cwd) as string;
-    optionsArg.to = plugins.smartpath.transform.toAbsolute(optionsArg.to, paths.cwd) as string;
-
-    // lets clean theh target directory
-    await plugins.smartfile.fs.ensureEmptyDir(optionsArg.to);
-
-    plugins.smartfile.fs.copySync(optionsArg.from, optionsArg.to, {
-      replaceTargetDir: true,
-    });
-  }
-}

ts/mod_assets/plugins.ts

@@ -1 +0,0 @@
-export * from '../plugins.js';

ts/mod_esbuild/index.child.ts

@@ -4,91 +4,73 @@ import * as interfaces from '../interfaces/index.js';
 import { logger } from '../tsbundle.logging.js';
 
 export class TsBundleProcess {
+
   constructor() {
     // Nothing here
   }
 
-  public async getAliases() {
-    try {
-      const aliasObject: Record<string, string> = {};
-      const localTsConfig = plugins.smartfile.fs.toObjectSync(
-        plugins.path.join(paths.cwd, 'tsconfig.json')
-      );
-      if (localTsConfig.compilerOptions && localTsConfig.compilerOptions.paths) {
-        for (const alias of Object.keys(localTsConfig.compilerOptions.paths)) {
-          const aliasPath = localTsConfig.compilerOptions.paths[alias][0];
-          aliasObject[alias] = aliasPath;
-        }
-      }
-      return aliasObject;
-    } catch (error) {
-      return {};
-    }
-  }
-
   /**
    * creates a bundle for the test enviroment
    */
-  public async buildTest(fromArg: string, toArg: string, argvArg: any) {
+  public async buildTest(
+    fromArg: string,
+    toArg: string,
+    argvArg: any
+  ) {
     // create a bundle
     const esbuild = await plugins.esbuild.build({
       entryPoints: [fromArg],
       bundle: true,
       sourcemap: true,
       format: 'esm',
-      target: 'es2022',
+      target: 'es2020',
-      entryNames: plugins.path.parse(toArg).name,
+      outfile: toArg,
-      outdir: plugins.path.parse(toArg).dir,
+      tsconfig: paths.tsconfigPath
-      // splitting: true,
-      tsconfig: paths.tsconfigPath,
-      alias: await this.getAliases(),
     });
   }
 
   /**
    * creates a bundle for the production environment
    */
-  public async buildProduction(fromArg: string, toArg: string, argvArg: any) {
+  public async buildProduction(
+    fromArg: string,
+    toArg: string,
+    argvArg: any
+  ) {
     // create a bundle
     console.log('esbuild specific:');
     console.log(`from: ${fromArg}`);
-    console.log(`to: ${toArg}`);
+    console.log((`to: ${toArg}`));
     const esbuild = await plugins.esbuild.build({
       entryPoints: [fromArg],
       bundle: true,
       sourcemap: true,
       format: 'esm',
-      target: 'es2022',
+      target: 'es2020',
       minify: true,
-      entryNames: 'bundle',
+      outfile: toArg,
-      outdir: plugins.path.parse(toArg).dir,
+      tsconfig: paths.tsconfigPath
-      tsconfig: paths.tsconfigPath,
-      // splitting: true,
-      chunkNames: 'chunks/[name]-[hash]',
-      alias: await this.getAliases(),
     });
   }
 }
 
 const run = async () => {
   console.log('running spawned compilation process');
-  const transportOptions: interfaces.IEnvTransportOptions = JSON.parse(
+  const transportOptions: interfaces.IEnvTransportOptions = JSON.parse(process.env.transportOptions);
-    process.env.transportOptions
-  );
   console.log('=======> ESBUILD');
   console.log(transportOptions);
   process.chdir(transportOptions.cwd);
   console.log(`switched to ${process.cwd()}`);
   const tsbundleProcessInstance = new TsBundleProcess();
   if (transportOptions.mode === 'test') {
-    console.log('building for test:');
+    console.log('building for test:')
     tsbundleProcessInstance.buildTest(
       plugins.smartpath.transform.makeAbsolute(transportOptions.from, process.cwd()),
       plugins.smartpath.transform.makeAbsolute(transportOptions.to, process.cwd()),
       transportOptions.argv
     );
   } else {
-    console.log('building for production:');
+    console.log('building for production:')
     tsbundleProcessInstance.buildProduction(
       plugins.smartpath.transform.makeAbsolute(transportOptions.from, process.cwd()),
       plugins.smartpath.transform.makeAbsolute(transportOptions.to, process.cwd()),

ts/plugins.ts

@@ -4,13 +4,13 @@ import * as path from 'path';
 export { path };
 
 // pushrocks scope
-import * as smartcli from '@push.rocks/smartcli';
+import * as smartcli from '@pushrocks/smartcli';
-import * as smartfile from '@push.rocks/smartfile';
+import * as smartfile from '@pushrocks/smartfile';
-import * as smartlog from '@push.rocks/smartlog';
+import * as smartlog from '@pushrocks/smartlog';
-import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
+import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
-import * as smartpath from '@push.rocks/smartpath';
+import * as smartpath from '@pushrocks/smartpath';
-import * as smartpromise from '@push.rocks/smartpromise';
+import * as smartpromise from '@pushrocks/smartpromise';
-import * as smartspawn from '@push.rocks/smartspawn';
+import * as smartspawn from '@pushrocks/smartspawn';
 
 export {
   smartcli,

ts/tsbundle.cli.ts

@@ -2,7 +2,6 @@ import * as plugins from './plugins.js';
 import { TsBundle } from './tsbundle.class.tsbundle.js';
 import { HtmlHandler } from './mod_html/index.js';
 import { logger } from './tsbundle.logging.js';
-import { AssetsHandler } from './mod_assets/index.js';
 
 export const runCli = async () => {
   const tsBundleCli = new plugins.smartcli.Smartcli();
@@ -35,8 +34,6 @@ export const runCli = async () => {
 
   tsBundleCli.addCommand('website').subscribe(async (argvArg) => {
     const tsbundle = new TsBundle();
-
-    // lets deal with the html
     const htmlHandler = new HtmlHandler();
     await tsbundle.build(
       process.cwd(),
@@ -52,10 +49,6 @@ export const runCli = async () => {
         minify: true,
       });
     }
-
-    // lets deal with the assets
-    const assetsHandler = new AssetsHandler();
-    await assetsHandler.processAssets();
   });
 
   tsBundleCli.startParse();

tsconfig.json

@@ -3,12 +3,7 @@
     "experimentalDecorators": true,
     "useDefineForClassFields": false,
     "target": "ES2022",
-    "module": "NodeNext",
+    "module": "ES2022",
-    "moduleResolution": "NodeNext",
+    "moduleResolution": "nodenext"
-    "esModuleInterop": true,
+  }
-    "verbatimModuleSyntax": true
-  },
-  "exclude": [
-    "dist_*/**/*.d.ts"
-  ]
 }