From 6bb30e4e5b9bfd5403819e63f3c6088ef44a8f23 Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Sat, 15 Oct 2022 10:51:42 +0200 Subject: [PATCH] fix(core): update --- .gitlab-ci.yml | 35 ++++++++++++----------------------- package.json | 2 +- ts/00_commitinfo_data.ts | 2 +- ts/business/contact.ts | 2 +- ts/business/pdf.ts | 4 ++-- ts/database/index.ts | 2 +- ts/database/wrappeddata.ts | 2 +- ts/finance/payment.ts | 2 +- ts/network/device.ts | 2 +- ts/website/index.ts | 2 +- 10 files changed, 22 insertions(+), 33 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f74f7d1..30b07d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,31 +13,24 @@ stages: - metadata before_script: - - npm install -g @shipzone/npmci + - pnpm install -g pnpm + - pnpm install -g @shipzone/npmci + - npmci npm prepare # ==================== # security stage # ==================== -mirror: - stage: security - script: - - npmci git mirror - only: - - tags - tags: - - lossless - - docker - - notpriv - +# ==================== +# security stage +# ==================== 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 @@ -45,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 @@ -60,7 +52,6 @@ auditDevDependencies: testStable: stage: test script: - - npmci npm prepare - npmci node install stable - npmci npm install - npmci npm test @@ -71,7 +62,6 @@ testStable: testBuild: stage: test script: - - npmci npm prepare - npmci node install stable - npmci npm install - npmci command npm run build @@ -122,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 b6ee191..1f48bc3 100644 --- a/package.json +++ b/package.json @@ -49,4 +49,4 @@ "browserslist": [ "last 1 chrome versions" ] -} +} \ No newline at end of file diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index ff9bc93..b027d3e 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@tsclass/tsclass', - version: '4.0.22', + version: '4.0.23', description: 'common classes for TypeScript' } diff --git a/ts/business/contact.ts b/ts/business/contact.ts index 3cac6a7..aa791bf 100644 --- a/ts/business/contact.ts +++ b/ts/business/contact.ts @@ -1,4 +1,4 @@ -import { finance } from '../index.js' +import { finance } from '../index.js'; import { business } from '../index.js'; export type TContactSalutation = 'Mr' | 'Ms' | 'Mrs'; diff --git a/ts/business/pdf.ts b/ts/business/pdf.ts index 5144842..67d4eb8 100644 --- a/ts/business/pdf.ts +++ b/ts/business/pdf.ts @@ -2,7 +2,7 @@ export interface IPdf { name: string; id: string; metadata: { - textExtraction: string; + textExtraction: string; }; buffer: ArrayBufferLike; -} \ No newline at end of file +} diff --git a/ts/database/index.ts b/ts/database/index.ts index 688be49..e6cf553 100644 --- a/ts/database/index.ts +++ b/ts/database/index.ts @@ -1,3 +1,3 @@ export * from './mongodescriptor.js'; export * from './objectaction.js'; -export * from './wrappeddata.js' \ No newline at end of file +export * from './wrappeddata.js'; diff --git a/ts/database/wrappeddata.ts b/ts/database/wrappeddata.ts index 85eb80b..e10abae 100644 --- a/ts/database/wrappeddata.ts +++ b/ts/database/wrappeddata.ts @@ -1,3 +1,3 @@ export interface IWrappedData { data: T; -} \ No newline at end of file +} diff --git a/ts/finance/payment.ts b/ts/finance/payment.ts index e884a50..09ccf9f 100644 --- a/ts/finance/payment.ts +++ b/ts/finance/payment.ts @@ -11,4 +11,4 @@ export interface IPayPalConnection { export interface IPaymentOptionInfo { sepaConnection: ISepaConnection; payPal: IPayPalConnection; -} \ No newline at end of file +} diff --git a/ts/network/device.ts b/ts/network/device.ts index 74a2f72..92c796a 100644 --- a/ts/network/device.ts +++ b/ts/network/device.ts @@ -7,4 +7,4 @@ export interface IDevice { name?: string; ipv4?: string; ipv6?: string; -} \ No newline at end of file +} diff --git a/ts/website/index.ts b/ts/website/index.ts index ffa1799..6249e9b 100644 --- a/ts/website/index.ts +++ b/ts/website/index.ts @@ -1 +1 @@ -export * from './menuitem.js'; \ No newline at end of file +export * from './menuitem.js';