From d4f5d19231d1778a9016fede8d25070e2e82160c Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Mon, 16 Sep 2019 13:19:42 +0200 Subject: [PATCH] fix(core): update --- .gitignore | 5 ++- .gitlab-ci.yml | 52 ++++++++++++---------------- README.md | 4 +-- package.json | 15 ++++++-- ts/npmextra.classes.keyvaluestore.ts | 9 +++-- 5 files changed, 46 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index e713ab4..91c0db0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,9 +8,12 @@ pages/ # installs node_modules/ -# caches and builds +# caches .yarn/ .cache/ +.rpt2_cache + +# builds dist/ dist_web/ dist_serve/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8321aed..ac532d3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ -# gitzone standard -image: hosttoday/ht-docker-node:npmci +# gitzone ci_default +image: registry.gitlab.com/hosttoday/ht-docker-node:npmci cache: paths: @@ -38,19 +38,7 @@ snyk: # test stage # ==================== -testLTS: - stage: test - script: - - npmci npm prepare - - npmci node install lts - - npmci npm install - - npmci npm test - coverage: /\d+.?\d+?\%\s*coverage/ - tags: - - docker - - notpriv - -testSTABLE: +testStable: stage: test script: - npmci npm prepare @@ -60,6 +48,18 @@ testSTABLE: coverage: /\d+.?\d+?\%\s*coverage/ tags: - docker + - priv + +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 - notpriv release: @@ -78,19 +78,11 @@ release: # ==================== codequality: stage: metadata - image: docker:stable allow_failure: true - services: - - docker:stable-dind script: - - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - - docker run - --env SOURCE_CODE="$PWD" - --volume "$PWD":/code - --volume /var/run/docker.sock:/var/run/docker.sock - "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code - artifacts: - paths: [codeclimate.json] + - npmci command npm install -g tslint typescript + - npmci npm install + - npmci command "tslint -c tslint.json ./ts/**/*.ts" tags: - docker - priv @@ -106,13 +98,15 @@ trigger: - notpriv pages: - image: hosttoday/ht-docker-node:npmci + image: hosttoday/ht-docker-dbase:npmci + services: + - docker:stable-dind stage: metadata script: - - npmci command npm install -g typedoc typescript + - npmci command npm install -g @gitzone/tsdoc - npmci npm prepare - npmci npm install - - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/ + - npmci command tsdoc tags: - docker - notpriv diff --git a/README.md b/README.md index 6ff5926..e4224b2 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,6 @@ mergedData = myNpmExtra.dataFor('sometool', { 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) +| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy) -[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com) +[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com) diff --git a/package.json b/package.json index a619aa9..34b1d3c 100644 --- a/package.json +++ b/package.json @@ -34,5 +34,16 @@ "@types/node": "^12.7.5", "tslint": "^5.20.0", "tslint-config-prettier": "^1.18.0" - } -} + }, + "files": [ + "ts/*", + "ts_web/*", + "dist/*", + "dist_web/*", + "dist_ts_web/*", + "assets/*", + "cli.js", + "npmextra.json", + "readme.md" + ] +} \ No newline at end of file diff --git a/ts/npmextra.classes.keyvaluestore.ts b/ts/npmextra.classes.keyvaluestore.ts index ec1a0a4..6f47c84 100644 --- a/ts/npmextra.classes.keyvaluestore.ts +++ b/ts/npmextra.classes.keyvaluestore.ts @@ -1,7 +1,7 @@ import * as plugins from './npmextra.plugins'; import * as paths from './npmextra.paths'; -import { Task, TaskOnce } from '@pushrocks/taskbuffer'; +import { Task } from '@pushrocks/taskbuffer'; export type TKeyValueStore = 'path' | 'gitProject' | 'custom'; @@ -26,7 +26,7 @@ export class KeyValueStore { } this.deletedObject = {}; await plugins.smartfile.memory.toFs(JSON.stringify(this.dataObject), this.filePath); - }, + } }); /** * computes the identity @@ -46,8 +46,7 @@ export class KeyValueStore { plugins.smartfile.fs.ensureDirSync(paths.kvGitDir); plugins.smartfile.fs.ensureDirSync(paths.kvPathDir); plugins.smartfile.fs.ensureFileSync(this.filePath, '{}'); - } - + }; public type: TKeyValueStore; // the type of the kvStore public identity: string; // the identity of the kvStore @@ -99,7 +98,7 @@ export class KeyValueStore { * writes all keyValue pairs in the object argument */ public async writeAll(keyValueObject) { - this.dataObject = {...this.dataObject, ...keyValueObject}; + this.dataObject = { ...this.dataObject, ...keyValueObject }; await this.syncTask.trigger(); }