2.0.23

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
+dist_*/
-dist_serve/
-dist_ts_web/
 
 # custom

.gitlab-ci.yml

@@ -3,14 +3,14 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
+    - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
+  - security
-- test
+  - test
-- release
+  - release
-- metadata
+  - metadata
 
 # ====================
 # security stage
@@ -18,48 +18,74 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
+  only:
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
-snyk:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
+    - npmci command npm install --production --ignore-scripts
-    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command snyk test
+    - npmci command npm audit --audit-level=high --only=prod --production
   tags:
-  - docker
+    - docker
-  - notpriv
+
+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
 # ====================
 
-testLTS:
+testStable:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
-  - npmci npm install
+    - npmci npm install
-  - npmci npm test
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - docker
-  - notpriv
+
+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 lts
+    - npmci node install stable
-  - npmci npm publish
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
@@ -67,33 +93,39 @@ release:
 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:
-  - docker
+    - lossless
-  - priv
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command npm install -g @gitzone/tsdoc
+    - npmci node install lts
+    - npmci command npm install -g @git.zone/tsdoc
     - npmci npm prepare
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -101,5 +133,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@git.zone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@git.zone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

README.md

@@ -1,28 +0,0 @@
-# @gitzone/tools
-setup your environment with the most important tools and update them easily.
-
-## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@gitzone/tools)
-* [gitlab.com (source)](https://gitlab.com/gitzone/tools)
-* [github.com (source mirror)](https://github.com/gitzone/tools)
-* [docs (typedoc)](https://gitzone.gitlab.io/tools/)
-
-## Status for master
-[![build status](https://gitlab.com/gitzone/tools/badges/master/build.svg)](https://gitlab.com/gitzone/tools/commits/master)
-[![coverage report](https://gitlab.com/gitzone/tools/badges/master/coverage.svg)](https://gitlab.com/gitzone/tools/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/@gitzone/tools.svg)](https://www.npmjs.com/package/@gitzone/tools)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@gitzone/tools/badge.svg)](https://snyk.io/test/npm/@gitzone/tools)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
-
-## Usage
-
-Use TypeScript for best in class instellisense.
-
-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)
-
-[![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)

assets/package_library.json

@@ -0,0 +1,13 @@
+{
+  "default": [
+    "@bubblewrap/cli",
+    "@losslessone_private/lole",
+    "@gitzone_private/gitzone",
+    "@git.zone/tsbuild",
+    "@git.zone/tsdocker",
+    "@git.zone/tsrun",
+    "nativescript",
+    "typescript",
+    "npm-check"
+  ]
+}

cli.js

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

cli.ts.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
-require('@gitzone/tsrun');
+require('@git.zone/tsrun');
-require('./ts/index');
+const cliTool = require('./ts/index');
+cliTool.runCli();

npmextra.json

@@ -9,12 +9,13 @@
     "npmAccessLevel": "public"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "gitzone",
       "gitrepo": "tools",
       "shortDescription": "setup your environment with the most important tools and update them easily.",
-      "npmPackagename": "@gitzone/tools",
+      "npmPackagename": "@git.zone/tools",
       "license": "MIT"
     }
   }

package.json

@@ -1,13 +1,14 @@
 {
-  "name": "@gitzone/tools",
+  "name": "@git.zone/tools",
-  "version": "2.0.8",
+  "version": "2.0.23",
   "private": false,
+  "type": "module",
   "description": "setup your environment with the most important tools and update them easily.",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
   "scripts": {
-    "test": "tstest test/",
+    "test": "(tstest test/ --web)",
-    "build": "tsbuild"
+    "build": "(tsbuild --web)"
   },
   "bin": {
     "gtools": "cli.js"
@@ -29,28 +30,30 @@
   },
   "homepage": "https://github.com/GitZoneTools/npmg#readme",
   "devDependencies": {
-    "@gitzone/tstest": "^1.0.24",
+    "@git.zone/tsbuild": "^4.1.2",
-    "@pushrocks/tapbundle": "^3.0.9",
+    "@git.zone/tstest": "^3.1.8"
-    "tslint": "^5.17.0",
-    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@gitzone/tsrun": "^1.2.6",
+    "@git.zone/tsrun": "^2.0.1",
-    "@pushrocks/smartcli": "^3.0.7",
+    "@push.rocks/smartcli": "^4.0.20",
-    "@pushrocks/smartfile": "^7.0.2",
+    "@push.rocks/smartlog": "^3.1.10",
-    "@pushrocks/smartlog": "^2.0.19",
+    "@push.rocks/smartlog-destination-local": "^9.0.2",
-    "@pushrocks/smartlog-destination-local": "^8.0.2",
+    "@push.rocks/smartshell": "^3.3.0",
-    "@pushrocks/smartshell": "^2.0.23",
+    "@types/node": "^25.2.0"
-    "@types/node": "^12.0.8"
   },
   "files": [
-    "ts/*",
+    "ts/**/*",
-    "ts_web/*",
+    "ts_web/**/*",
-    "dist/*",
+    "dist/**/*",
-    "dist_web/*",
+    "dist_*/**/*",
-    "assets/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

package_library.json

@@ -1,12 +0,0 @@
-{
-  "default":[
-    "@gitzone_private/gitzone",
-    "typescript",
-    "tslint",
-    "@gitzone/tsrun",
-    "@gitzone/tsdocker",
-    "snyk",
-    "npm-check"
-  ]
-  
-}

test/test.node.ts

@@ -0,0 +1,14 @@
+import { expect, tap } from '@git.zone/tstest/tapbundle';
+
+import * as tools from '../ts/tools.install.js';
+
+tap.test('should have install function exported', async () => {
+  expect(typeof tools.install).toEqual('function');
+});
+
+tap.test('should handle unknown package set', async () => {
+  // This will just log a warning, not throw
+  await tools.install('unknown');
+});
+
+export default tap.start();

test/test.ts

@@ -1,9 +0,0 @@
-import { expect, tap } from '@pushrocks/tapbundle';
-
-import * as tools from '../ts/tools.install';
-
-tap.test("should install default list globally when parsed 'default' as argument", async () => {
-  await tools.install('default');
-});
-
-tap.start();

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@git.zone/tools',
+  version: '2.0.23',
+  description: 'setup your environment with the most important tools and update them easily.'
+}

ts/index.ts

@@ -1,2 +1,9 @@
-import plugins = require('./tools.plugins');
+import * as plugins from './tools.plugins.js';
-import * as cli from './tools.cli';
+import * as cli from './tools.cli.js';
+
+export const runCli = async () => {
+  await cli.run();
+};
+
+// Auto-run when called directly
+runCli();

ts/tools.cli.ts

@@ -1,11 +1,13 @@
-import * as plugins from './tools.plugins';
+import * as plugins from './tools.plugins.js';
-import * as toolsInstall from './tools.install';
+import * as toolsInstall from './tools.install.js';
 
-const toolsCli = new plugins.smartcli.Smartcli();
+export const run = async () => {
+  const toolsCli = new plugins.smartcli.Smartcli();
 
-toolsCli.addCommand('install').subscribe(async argvArg => {
+  toolsCli.addCommand('install').subscribe(async (argvArg) => {
-  toolsInstall.install('default');
+    toolsInstall.install('default');
-});
+  });
 
-toolsCli.addVersion('no version set');
+  toolsCli.addVersion('no version set');
-toolsCli.startParse();
+  toolsCli.startParse();
+};

ts/tools.install.ts

@@ -1,10 +1,10 @@
-import plugins = require('./tools.plugins');
+import * as plugins from './tools.plugins.js';
-import paths = require('./tools.paths');
+import * as paths from './tools.paths.js';
-import { logger } from './tools.logging';
+import { logger } from './tools.logging.js';
 
 const installExec = async (packageNames: string[]) => {
   const smartshellInstance = new plugins.smartshell.Smartshell({
-    executor: 'bash'
+    executor: 'bash',
   });
 
   let installString = '';
@@ -22,8 +22,8 @@ const installExec = async (packageNames: string[]) => {
   logger.log('ok', `installed tools successfully!`);
 };
 
-const packageLibrary = plugins.smartfile.fs.toObjectSync(
+const packageLibrary = JSON.parse(
-  plugins.path.join(paths.packageBase, 'package_library.json')
+  plugins.fs.readFileSync(plugins.path.join(paths.assetsDir, 'package_library.json'), 'utf8')
 );
 
 export const install = async (packageSetArg: string) => {

ts/tools.logging.ts

@@ -1,4 +1,4 @@
-import * as plugins from './tools.plugins';
+import * as plugins from './tools.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/tools.paths.ts

@@ -1,3 +1,8 @@
-import plugins = require('./tools.plugins');
+import * as plugins from './tools.plugins.js';
+import { fileURLToPath } from 'url';
 
-export let packageBase = plugins.path.join('__dirname', '../');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = plugins.path.dirname(__filename);
+
+export const packageBase = plugins.path.join(__dirname, '../');
+export const assetsDir = plugins.path.join(packageBase, './assets');

ts/tools.plugins.ts

@@ -1,11 +1,11 @@
 // node native
 import * as path from 'path';
+import * as fs from 'fs';
 
-// pushrocks scope
+// push.rocks scope
-import * as smartlog from '@pushrocks/smartlog';
+import * as smartlog from '@push.rocks/smartlog';
-import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
+import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
-import * as smartcli from '@pushrocks/smartcli';
+import * as smartcli from '@push.rocks/smartcli';
-import * as smartfile from '@pushrocks/smartfile';
+import * as smartshell from '@push.rocks/smartshell';
-import * as smartshell from '@pushrocks/smartshell';
 
-export { smartlog, smartlogDestinationLocal, path, smartcli, smartfile, smartshell };
+export { smartlog, smartlogDestinationLocal, path, fs, smartcli, smartshell };