From 9b7f76b22a5d889edcbf12717217bc0ee05281d2 Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Mon, 3 Apr 2023 13:52:27 +0200 Subject: [PATCH] fix(core): update --- .gitlab-ci.yml | 26 +++++++++++++------------- package.json | 2 +- readme.md | 6 ++---- ts/00_commitinfo_data.ts | 2 +- ts/data/checkcollection.ts | 2 -- ts/data/checks/function.check.ts | 6 +++--- ts/data/checks/pagerank.check.ts | 6 +++--- ts/data/checks/pwa.check.ts | 2 +- ts/data/property.ts | 2 +- ts/data/search.ts | 2 +- ts/data/status.ts | 6 +++--- ts/requests/requests.checks.ts | 2 +- ts/ul-interfaces.plugins.ts | 4 +--- 13 files changed, 31 insertions(+), 37 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69b3e08..c96d0c9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,8 +13,13 @@ stages: - metadata before_script: - - npm install -g @shipzone/npmci + - pnpm install -g pnpm + - pnpm install -g @shipzone/npmci + - npmci npm prepare +# ==================== +# security stage +# ==================== # ==================== # security stage # ==================== @@ -22,11 +27,10 @@ auditProductionDependencies: 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 + - npmci command npm config set registry https://registry.npmjs.org + - npmci command pnpm audit --audit-level=high --prod tags: + - lossless - docker allow_failure: true @@ -34,11 +38,10 @@ 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 + - npmci command pnpm audit --audit-level=high --dev tags: + - lossless - docker allow_failure: true @@ -49,7 +52,6 @@ auditDevDependencies: testStable: stage: test script: - - npmci npm prepare - npmci node install stable - npmci npm install - npmci npm test @@ -60,10 +62,9 @@ testStable: testBuild: stage: test script: - - npmci npm prepare - npmci node install stable - npmci npm install - - npmci command npm run build + - npmci npm build coverage: /\d+.?\d+?\%\s*coverage/ tags: - docker @@ -111,8 +112,7 @@ trigger: pages: stage: metadata script: - - npmci node install stable - - npmci npm prepare + - npmci node install stable - npmci npm install - npmci command npm run buildDocs tags: diff --git a/package.json b/package.json index 5adbdc6..4bd7d61 100644 --- a/package.json +++ b/package.json @@ -38,4 +38,4 @@ "browserslist": [ "last 1 chrome versions" ] -} +} \ No newline at end of file diff --git a/readme.md b/readme.md index a986a8b..7ab9cc2 100644 --- a/readme.md +++ b/readme.md @@ -21,7 +21,6 @@ Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](htt PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@uptime.link/interfaces)](https://lossless.cloud) PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@uptime.link/interfaces)](https://lossless.cloud) BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@uptime.link/interfaces)](https://lossless.cloud) -Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud) ## Usage @@ -35,7 +34,6 @@ We are always happy for code contributions. If you are not the code contributing For further information read the linked docs at the top of this readme. -> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh) +## Legal +> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc) | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy) - -[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com) diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index d42dae5..e2b801e 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@uptime.link/interfaces', - version: '2.0.5', + version: '2.0.6', description: 'TypeScript interface for the uptime.link API and modules' } diff --git a/ts/data/checkcollection.ts b/ts/data/checkcollection.ts index 6569e4f..2bae422 100644 --- a/ts/data/checkcollection.ts +++ b/ts/data/checkcollection.ts @@ -3,8 +3,6 @@ import * as search from './search.js'; import * as checks from './checks/index.js'; - - export interface ICheckCollection { id: string; intervalMs: number; diff --git a/ts/data/checks/function.check.ts b/ts/data/checks/function.check.ts index 32a919e..14bb2dd 100644 --- a/ts/data/checks/function.check.ts +++ b/ts/data/checks/function.check.ts @@ -1,4 +1,4 @@ -import { TCheckResultStatus, TExecutionTiming } from "./index.js"; +import { TCheckResultStatus, TExecutionTiming } from './index.js'; export interface IFunctionCheck { checkId: string; @@ -11,5 +11,5 @@ export interface IFunctionCheck { status: TCheckResultStatus; data: any; checkLog: string[]; - }> -} \ No newline at end of file + }>; +} diff --git a/ts/data/checks/pagerank.check.ts b/ts/data/checks/pagerank.check.ts index 7fcea03..9e17ed9 100644 --- a/ts/data/checks/pagerank.check.ts +++ b/ts/data/checks/pagerank.check.ts @@ -14,6 +14,6 @@ export interface IPageRankCheck { executionResults: Array<{ timing: TExecutionTiming; status: TCheckResultStatus; - pageRankResult: search.IPageRankResult - }> -} \ No newline at end of file + pageRankResult: search.IPageRankResult; + }>; +} diff --git a/ts/data/checks/pwa.check.ts b/ts/data/checks/pwa.check.ts index 5a3641f..193ac90 100644 --- a/ts/data/checks/pwa.check.ts +++ b/ts/data/checks/pwa.check.ts @@ -1,4 +1,4 @@ -import { TCheckResultStatus } from "./index.js"; +import { TCheckResultStatus } from './index.js'; export interface IPwaCheck { inputData: { domain: string }; diff --git a/ts/data/property.ts b/ts/data/property.ts index d75e0d3..8897843 100644 --- a/ts/data/property.ts +++ b/ts/data/property.ts @@ -7,4 +7,4 @@ export class IUplinkProperty { type: 'website' | 'app' | 'api' | 'other'; access: 'private' | 'public' | 'auth'; checkCollectionIdRefs: string[]; -} \ No newline at end of file +} diff --git a/ts/data/search.ts b/ts/data/search.ts index c880961..6a97d05 100644 --- a/ts/data/search.ts +++ b/ts/data/search.ts @@ -18,4 +18,4 @@ export interface IPageRankResult { google: ISearchResult[]; bing: ISearchResult[]; }; -} \ No newline at end of file +} diff --git a/ts/data/status.ts b/ts/data/status.ts index c97d0b0..ef6396b 100644 --- a/ts/data/status.ts +++ b/ts/data/status.ts @@ -1,12 +1,12 @@ import * as plugins from '../ul-interfaces.plugins.js'; export interface IStatus { - last90days: IDailyStatus[]; + last90days: IDailyStatus[]; } export interface IDailyStatus { - timezone: 'UTC', + timezone: 'UTC'; date: plugins.tsclass.general.IDate; overallStatus: 'ok' | 'reduced' | 'outage'; incidentRefs: string[]; -} \ No newline at end of file +} diff --git a/ts/requests/requests.checks.ts b/ts/requests/requests.checks.ts index ee916b6..8bc604b 100644 --- a/ts/requests/requests.checks.ts +++ b/ts/requests/requests.checks.ts @@ -12,5 +12,5 @@ export interface IRequest_CheckExchange }; response: { checkCollection: ICheckCollection; - } + }; } diff --git a/ts/ul-interfaces.plugins.ts b/ts/ul-interfaces.plugins.ts index 1d3e062..448e38f 100644 --- a/ts/ul-interfaces.plugins.ts +++ b/ts/ul-interfaces.plugins.ts @@ -5,6 +5,4 @@ export { typedRequestInterfaces }; // tsclass scope import * as tsclass from '@tsclass/tsclass'; -export { - tsclass -} +export { tsclass };