From 6eb86c63c3f341a23f58ceac97e8ccab7701c1e6 Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Tue, 8 Nov 2022 08:04:46 +0100 Subject: [PATCH] fix(core): update --- .gitlab-ci.yml | 41 +++++++++++++------------------------ package.json | 5 +++-- ts/00_commitinfo_data.ts | 2 +- ts/tstest.classes.tstest.ts | 6 +++--- 4 files changed, 21 insertions(+), 33 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a70f7eb..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 @@ -100,10 +90,9 @@ codequality: only: - tags script: - - npmci command npm install -g tslint typescript + - npmci command npm install -g typescript - npmci npm prepare - npmci npm install - - npmci command "tslint -c tslint.json ./ts/**/*.ts" tags: - lossless - docker @@ -123,11 +112,9 @@ trigger: pages: stage: metadata script: - - npmci node install lts - - npmci command npm install -g @gitzone/tsdoc - - npmci npm prepare + - npmci node install stable - npmci npm install - - npmci command tsdoc + - npmci command npm run buildDocs tags: - lossless - docker diff --git a/package.json b/package.json index 227d65f..f49cc92 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,8 @@ "prepareTest": "git clone https://gitlab.com/sandboxzone/sandbox-npmts.git .nogit/sandbox-npmts && cd .nogit/sandbox-npmts && npm install", "tstest": "cd .nogit/sandbox-npmts && node ../../cli.ts.js test/ --web", "cleanUp": "rm -rf .nogit/sandbox-npmts", - "build": "(tsbuild --web --allowimplicitany)" + "build": "(tsbuild --web --allowimplicitany)", + "buildDocs": "tsdoc" }, "devDependencies": { "@gitzone/tsbuild": "^2.1.65", @@ -51,4 +52,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 744bd91..10b7aa8 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@gitzone/tstest', - version: '1.0.74', + version: '1.0.75', description: 'a test utility to run tests that match test/**/*.ts' } diff --git a/ts/tstest.classes.tstest.ts b/ts/tstest.classes.tstest.ts index 854e357..8b1d628 100644 --- a/ts/tstest.classes.tstest.ts +++ b/ts/tstest.classes.tstest.ts @@ -45,11 +45,11 @@ export class TsTest { ); console.log('!!!!!!!!!!!'); break; - case (fileNameArg.endsWith('.browser.ts') || fileNameArg.endsWith('.browser.nonci.ts' )): + case fileNameArg.endsWith('.browser.ts') || fileNameArg.endsWith('.browser.nonci.ts'): const tapParserBrowser = await this.runInChrome(fileNameArg); tapCombinator.addTapParser(tapParserBrowser); break; - case (fileNameArg.endsWith('.both.ts') || fileNameArg.endsWith('.both.nonci.ts')): + case fileNameArg.endsWith('.both.ts') || fileNameArg.endsWith('.both.nonci.ts'): console.log('>>>>>>> TEST PART 1: chrome'); const tapParserBothBrowser = await this.runInChrome(fileNameArg); tapCombinator.addTapParser(tapParserBothBrowser); @@ -101,7 +101,7 @@ export class TsTest { // lets bundle the test await plugins.smartfile.fs.ensureEmptyDir(tsbundleCacheDirPath); await this.tsbundleInstance.build(process.cwd(), fileNameArg, bundleFilePath, { - bundler: 'esbuild' + bundler: 'esbuild', }); // lets create a server