3.1.28

.gitignore

@@ -1,7 +1,19 @@
-dist/
-node_modules/
+.nogit/
+
+# artifacts
 coverage/
 public/
-config.json
+pages/
+
+# installs
+node_modules/
+
+# caches and builds
 .yarn/
-.npmci_cache
+.cache/
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-# gitzone standard
+# gitzone ci_default
 image: hosttoday/ht-docker-node:npmci
 
 cache:
@@ -34,31 +34,6 @@ snyk:
   - docker
   - notpriv
 
-sast:
-  stage: security
-  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
-  variables:
-    DOCKER_DRIVER: overlay2
-  allow_failure: true
-  services:
-    - docker:stable-dind
-  script:
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command npm run build
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
-        --volume "$PWD:/code"
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
-  artifacts:
-    reports:
-      sast: gl-sast-report.json
-  tags:
-  - docker
-  - priv
-
 # ====================
 # test stage
 # ====================

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipzone/npmci",
-  "version": "3.1.22",
+  "version": "3.1.28",
   "private": false,
   "description": "node and docker in gitlab ci on steroids",
   "main": "dist/index.js",
@@ -24,35 +24,43 @@
   },
   "homepage": "https://gitlab.com/gitzone/npmci#README",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
-    "@gitzone/tsrun": "^1.1.13",
-    "@gitzone/tstest": "^1.0.15",
-    "@pushrocks/tapbundle": "^3.0.7",
-    "@types/node": "^10.12.10",
-    "tslint": "^5.11.0",
-    "tslint-config-prettier": "^1.17.0"
+    "@gitzone/tsbuild": "^2.1.11",
+    "@gitzone/tsrun": "^1.2.6",
+    "@gitzone/tstest": "^1.0.24",
+    "@pushrocks/tapbundle": "^3.0.9",
+    "@types/node": "^12.0.8",
+    "tslint": "^5.17.0",
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/lik": "^3.0.2",
-    "@pushrocks/npmextra": "^3.0.1",
+    "@pushrocks/lik": "^3.0.5",
+    "@pushrocks/npmextra": "^3.0.5",
     "@pushrocks/projectinfo": "^4.0.2",
-    "@pushrocks/smartcli": "^3.0.6",
-    "@pushrocks/smartdelay": "^2.0.2",
-    "@pushrocks/smartfile": "^6.0.11",
-    "@pushrocks/smartlog": "^2.0.9",
-    "@pushrocks/smartlog-destination-local": "^7.0.5",
+    "@pushrocks/smartanalytics": "^2.0.15",
+    "@pushrocks/smartcli": "^3.0.7",
+    "@pushrocks/smartdelay": "^2.0.3",
+    "@pushrocks/smartfile": "^7.0.2",
+    "@pushrocks/smartlog": "^2.0.19",
+    "@pushrocks/smartlog-destination-local": "^8.0.2",
     "@pushrocks/smartparam": "^1.0.4",
-    "@pushrocks/smartpromise": "^2.0.5",
-    "@pushrocks/smartrequest": "^1.1.14",
-    "@pushrocks/smartshell": "^2.0.11",
+    "@pushrocks/smartpromise": "^3.0.2",
+    "@pushrocks/smartrequest": "^1.1.16",
+    "@pushrocks/smartshell": "^2.0.23",
+    "@pushrocks/smartsocket": "^1.1.38",
     "@pushrocks/smartssh": "^1.2.3",
-    "@pushrocks/smartstring": "^3.0.5",
-    "@types/lodash": "^4.14.118",
-    "@types/shelljs": "^0.8.0",
+    "@pushrocks/smartstring": "^3.0.10",
+    "@types/shelljs": "^0.8.5",
     "@types/through2": "^2.0.34",
-    "lodash": "^4.17.11",
-    "smartanalytics": "^2.0.9",
-    "smartsocket": "^1.1.19",
-    "through2": "^3.0.0"
-  }
+    "through2": "^3.0.1"
+  },
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

ts/mod_node/index.ts

@@ -36,7 +36,7 @@ export let install = async versionArg => {
   logger.log('info', `now installing node version ${versionArg}`);
   let version: string;
   if (versionArg === 'stable') {
-    version = '11';
+    version = '12';
   } else if (versionArg === 'lts') {
     version = '10';
   } else if (versionArg === 'legacy') {

ts/npmci.monitor.ts

@@ -2,7 +2,7 @@ import { logger } from './npmci.logging';
 import * as plugins from './npmci.plugins';
 import * as env from './npmci.env';
 
-import { Analytics } from 'smartanalytics';
+import { Analytics } from '@pushrocks/smartanalytics';
 
 export let npmciAnalytics = new Analytics({
   apiEndPoint: 'https://pubapi.lossless.one/analytics',

ts/npmci.plugins.ts

@@ -15,7 +15,7 @@ import * as smartparam from '@pushrocks/smartparam';
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartrequest from '@pushrocks/smartrequest';
 import * as smartshell from '@pushrocks/smartshell';
-import * as smartsocket from 'smartsocket';
+import * as smartsocket from '@pushrocks/smartsocket';
 import * as smartssh from '@pushrocks/smartssh';
 import * as smartstring from '@pushrocks/smartstring';
 
@@ -36,8 +36,6 @@ export {
   smartstring
 };
 
-// third party
-import * as lodash from 'lodash';
 import * as through2 from 'through2';
 
-export { lodash, through2 };
+export { through2 };