From ea41d5231b2d60145488e2a7b001a2bf6d23ca21 Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Wed, 4 Jan 2023 15:10:23 +0100 Subject: [PATCH] fix(core): update --- .gitlab-ci.yml | 35 ++++------- .vscode/launch.json | 24 +------- html/index.html | 112 ++--------------------------------- html/index.ts | 4 +- npmextra.json | 2 +- package.json | 5 +- ts_web/00_commitinfo_data.ts | 2 +- 7 files changed, 26 insertions(+), 158 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b40a17..14dc68d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,28 +12,23 @@ stages: - release - metadata +before_script: + - pnpm install -g pnpm + - pnpm install -g @shipzone/npmci + - npmci npm prepare + +# ==================== +# security stage +# ==================== # ==================== # security stage # ==================== -mirror: - stage: security - script: - - npmci git mirror - only: - - tags - tags: - - lossless - - docker - - notpriv - 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 @@ -42,10 +37,8 @@ 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 @@ -58,7 +51,6 @@ auditDevDependencies: testStable: stage: test script: - - npmci npm prepare - npmci node install stable - npmci npm install - npmci npm test @@ -71,7 +63,6 @@ testStable: testBuild: stage: test script: - - npmci npm prepare - npmci node install stable - npmci npm install - npmci command npm run build @@ -102,10 +93,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 @@ -127,7 +117,6 @@ pages: script: - npmci node install lts - npmci command npm install -g @gitzone/tsdoc - - npmci npm prepare - npmci npm install - npmci command tsdoc tags: diff --git a/.vscode/launch.json b/.vscode/launch.json index 112db52..26e9f92 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -2,28 +2,10 @@ "version": "0.2.0", "configurations": [ { - "name": "current file", - "type": "node", + "command": "npm test", + "name": "Run npm test", "request": "launch", - "args": [ - "${relativeFile}" - ], - "runtimeArgs": ["-r", "@gitzone/tsrun"], - "cwd": "${workspaceRoot}", - "protocol": "inspector", - "internalConsoleOptions": "openOnSessionStart" - }, - { - "name": "test.ts", - "type": "node", - "request": "launch", - "args": [ - "test/test.ts" - ], - "runtimeArgs": ["-r", "@gitzone/tsrun"], - "cwd": "${workspaceRoot}", - "protocol": "inspector", - "internalConsoleOptions": "openOnSessionStart" + "type": "node-terminal" } ] } diff --git a/html/index.html b/html/index.html index 1f8185e..c58ad64 100644 --- a/html/index.html +++ b/html/index.html @@ -1,7 +1,6 @@ - + - @@ -10,119 +9,16 @@ content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" /> - - - - - - - - - - - - - - - - - + + - - - diff --git a/html/index.ts b/html/index.ts index 422ba23..3d9151b 100644 --- a/html/index.ts +++ b/html/index.ts @@ -3,8 +3,8 @@ import * as deesWccTools from '@designestate/dees-wcctools'; import * as deesDomTools from '@designestate/dees-domtools'; // elements and pages -import * as elements from '../ts_web/elements'; -import * as pages from '../ts_web/pages'; +import * as elements from '../ts_web/elements/index.js'; +import * as pages from '../ts_web/pages/index.js'; deesWccTools.setupWccTools(elements as any, pages); deesDomTools.elementBasic.setup(); diff --git a/npmextra.json b/npmextra.json index 1cbc144..a021cf8 100644 --- a/npmextra.json +++ b/npmextra.json @@ -5,7 +5,7 @@ "githost": "gitlab.com", "gitscope": "designestate", "gitrepo": "lele-appui-catalog", - "shortDescription": "a catalog with app webcomponents", + "description": "a catalog with app webcomponents", "npmPackagename": "@designestate/lele-appui-catalog", "license": "MIT", "projectDomain": "design.estate" diff --git a/package.json b/package.json index ff433fc..b311f80 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "scripts": { "test": "npm run build", "build": "tsbuild element --allowimplicitany && tsbundle element --production", - "watch": "tswatch element" + "watch": "tswatch element", + "buildDocs": "tsdoc" }, "author": "Lossless GmbH", "license": "UNLICENSED", @@ -43,4 +44,4 @@ "browserslist": [ "last 1 Chrome versions" ] -} +} \ No newline at end of file diff --git a/ts_web/00_commitinfo_data.ts b/ts_web/00_commitinfo_data.ts index db1cf81..6f31c2c 100644 --- a/ts_web/00_commitinfo_data.ts +++ b/ts_web/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@losslessone_private/lele-appui-catalog', - version: '1.0.69', + version: '1.0.70', description: 'a catalog with app webcomponents' }