.gitignore

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

.gitlab-ci.yml

@@ -1,16 +1,18 @@
 # gitzone ci_default
 image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+variables:
+  GIT_STRATEGY: clone
 
 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,74 +20,60 @@ stages:
 mirror:
   stage: security
   script:
-    - npmci git mirror
+  - npmci git mirror
-  only:
-    - tags
   tags:
-    - lossless
+  - docker
-    - docker
+  - notpriv
-    - notpriv
 
-auditProductionDependencies:
+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
-
-auditDevDependencies:
-  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 --ignore-scripts
-    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command snyk test
-    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - docker
+  - docker
-  allow_failure: true
+  - notpriv
 
 # ====================
 # test stage
 # ====================
 
-testStable:
+testLTS:
   stage: test
   script:
-    - npmci npm prepare
+  - npmci npm prepare
-    - npmci node install stable
+  - npmci node install lts
-    - npmci npm install
+  - npmci npm install
-    - npmci npm test
+  - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - docker
+  - docker
+  - priv
 
 testBuild:
   stage: test
   script:
-    - npmci npm prepare
+  - npmci npm prepare
-    - npmci node install stable
+  - npmci node install lts
-    - npmci npm install
+  - npmci npm install
-    - npmci command npm run build
+  - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - docker
+  - docker
+  - notpriv
 
 release:
   stage: release
   script:
-    - npmci node install stable
+  - npmci node install lts
-    - npmci npm publish
+  - npmci npm publish
   only:
-    - tags
+  - tags
   tags:
-    - lossless
+  - docker
-    - docker
+  - notpriv
-    - notpriv
 
 # ====================
 # metadata stage
@@ -93,39 +81,35 @@ 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:
-    - lossless
+  - docker
-    - docker
+  - priv
-    - priv
 
 trigger:
   stage: metadata
   script:
-    - npmci trigger
+  - npmci trigger
   only:
-    - tags
+  - tags
   tags:
-    - lossless
+  - docker
-    - docker
+  - notpriv
-    - notpriv
 
 pages:
+  image: hosttoday/ht-docker-dbase:npmci
+  services:
+   - docker:18-dind
   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:
@@ -133,5 +117,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-      - public
+    - public
   allow_failure: true

.vscode/launch.json

@@ -1,29 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "current file",
-      "type": "node",
-      "request": "launch",
-      "args": [
-        "${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

@@ -1,26 +0,0 @@
-{
-  "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"]
-              }
-            }
-          }
-        }
-      }
-    }
-  ]
-}

cli.js

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

cli.ts.js

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

npmextra.json

@@ -9,7 +9,6 @@
     "npmAccessLevel": "public"
   },
   "gitzone": {
-    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "gitzone",

package.json

@@ -1,13 +1,14 @@
 {
   "name": "@gitzone/tools",
-  "version": "2.0.22",
+  "version": "2.0.14",
   "private": false,
   "description": "setup your environment with the most important tools and update them easily.",
-  "main": "dist_ts/index.js",
+  "main": "dist/index.js",
-  "typings": "dist_ts/index.d.ts",
+  "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(tstest test/ --web)",
+    "test": "tstest test/",
-    "build": "(tsbuild --web)"
+    "build": "tsbuild",
+    "start": "node cli.ts.js"
   },
   "bin": {
     "gtools": "cli.js"
@@ -29,34 +30,29 @@
   },
   "homepage": "https://github.com/GitZoneTools/npmg#readme",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tstest": "^1.0.24",
-    "@gitzone/tstest": "^1.0.52",
+    "@pushrocks/tapbundle": "^3.0.13",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "tslint": "^5.19.0",
-    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@gitzone/tsrun": "^1.2.12",
+    "@gitzone/tsrun": "^1.2.8",
-    "@pushrocks/smartcli": "^3.0.12",
+    "@pushrocks/smartcli": "^3.0.7",
-    "@pushrocks/smartfile": "^8.0.4",
+    "@pushrocks/smartfile": "^7.0.4",
-    "@pushrocks/smartlog": "^2.0.39",
+    "@pushrocks/smartlog": "^2.0.19",
-    "@pushrocks/smartlog-destination-local": "^8.0.8",
+    "@pushrocks/smartlog-destination-local": "^8.0.2",
-    "@pushrocks/smartshell": "^2.0.26",
+    "@pushrocks/smartshell": "^2.0.23",
-    "@types/node": "^14.11.2"
+    "@types/node": "^12.7.2"
   },
   "files": [
-    "ts/**/*",
+    "ts/*",
-    "ts_web/**/*",
+    "ts_web/*",
-    "dist/**/*",
+    "dist/*",
-    "dist_*/**/*",
+    "dist_web/*",
-    "dist_ts/**/*",
+    "dist_ts_web/*",
-    "dist_ts_web/**/*",
+    "assets/*",
-    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
-  ],
-  "browserslist": [
-    "last 1 chrome versions"
   ]
 }

package_library.json

@@ -1,16 +1,14 @@
 {
   "default":[
-    "@bubblewrap/cli",
     "@losslessone_private/lole",
     "@gitzone_private/gitzone",
     "@gitzone/tsbuild",
     "@gitzone/tsdocker",
     "@gitzone/tsrun",
-    "nativescript",
     "typescript",
     "tslint",
-    "npm-check",
+    "snyk",
-    ""
+    "npm-check"
   ]
   
 }

ts/tools.cli.ts

@@ -4,7 +4,7 @@ import * as toolsInstall from './tools.install';
 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');
   });
 

ts/tools.install.ts

@@ -4,7 +4,7 @@ import { logger } from './tools.logging';
 
 const installExec = async (packageNames: string[]) => {
   const smartshellInstance = new plugins.smartshell.Smartshell({
-    executor: 'bash',
+    executor: 'bash'
   });
 
   let installString = '';
@@ -23,7 +23,7 @@ const installExec = async (packageNames: string[]) => {
 };
 
 const packageLibrary = plugins.smartfile.fs.toObjectSync(
-  plugins.path.join(paths.assetsDir, 'package_library.json')
+  plugins.path.join(paths.packageBase, 'package_library.json')
 );
 
 export const install = async (packageSetArg: string) => {

ts/tools.logging.ts

@@ -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,4 +1,3 @@
 import plugins = require('./tools.plugins');
 
 export const packageBase = plugins.path.join(__dirname, '../');
-export const assetsDir = plugins.path.join(packageBase, './assets');