From 54a0521f9eceb36879c2fd9098e7089f0e5158ba Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Fri, 16 Aug 2019 21:38:50 +0200 Subject: [PATCH] fix(core): update --- .gitignore | 22 ++++++++++++++++++++-- .gitlab-ci.yml | 36 +++++++++++++++--------------------- README.md | 4 ++-- package.json | 15 +++++++++++++-- ts/smartrequest.request.ts | 4 ++-- 5 files changed, 52 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 1514716..91c0db0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,22 @@ -node_modules/ +.nogit/ + +# artifacts coverage/ public/ -pages/ \ No newline at end of file +pages/ + +# installs +node_modules/ + +# caches +.yarn/ +.cache/ +.rpt2_cache + +# builds +dist/ +dist_web/ +dist_serve/ +dist_ts_web/ + +# custom \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8321aed..938529d 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: @@ -49,14 +49,14 @@ testLTS: tags: - docker - notpriv - -testSTABLE: + +testBuild: stage: test script: - npmci npm prepare - - npmci node install stable + - npmci node install lts - npmci npm install - - npmci npm test + - npmci command npm run build coverage: /\d+.?\d+?\%\s*coverage/ tags: - docker @@ -65,7 +65,7 @@ testSTABLE: release: stage: release script: - - npmci node install stable + - npmci node install lts - npmci npm publish only: - tags @@ -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:18-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 05b10d5..c9ab115 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,6 @@ smartrequest.get('https://example.com/bigfile.mp4', optionsArg, true).then(res = 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 fb015ff..3cac59e 100644 --- a/package.json +++ b/package.json @@ -33,5 +33,16 @@ "@gitzone/tstest": "^1.0.20", "@pushrocks/tapbundle": "^3.0.9", "@types/node": "^11.13.6" - } -} + }, + "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/smartrequest.request.ts b/ts/smartrequest.request.ts index e0bc04a..b92ae1f 100644 --- a/ts/smartrequest.request.ts +++ b/ts/smartrequest.request.ts @@ -65,12 +65,12 @@ export let request = async ( // merge options const defaultOptions: interfaces.ISmartRequestOptions = { autoJsonParse: true - } + }; optionsArg = { ...defaultOptions, ...optionsArg - } + }; // parse url let parsedUrl: plugins.url.Url;