From 85a472fe1c11f41568675804372b6b237dc7a53a Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Thu, 24 Mar 2022 16:14:12 +0100 Subject: [PATCH] fix(core): update --- .gitlab-ci.yml | 7 +++++-- .vscode/launch.json | 24 +++--------------------- html/index.html | 2 +- html/index.ts | 6 +++--- npmextra.json | 2 +- package.json | 2 +- test/elements/test-demoelement.ts | 2 +- 7 files changed, 15 insertions(+), 30 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a4467e..7b61eb3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,9 @@ stages: - release - metadata +before_script: + - npm install -g @shipzone/npmci + # ==================== # security stage # ==================== @@ -36,6 +39,7 @@ auditProductionDependencies: - npmci command npm audit --audit-level=high --only=prod --production tags: - docker + allow_failure: true auditDevDependencies: image: registry.gitlab.com/hosttoday/ht-docker-node:npmci @@ -96,10 +100,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 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 e3b4bdd..c58ad64 100644 --- a/html/index.html +++ b/html/index.html @@ -17,7 +17,7 @@ } - + diff --git a/html/index.ts b/html/index.ts index fc36f9c..86ec7a2 100644 --- a/html/index.ts +++ b/html/index.ts @@ -1,10 +1,10 @@ // dees tools -import * as deesWccTools from '../ts_web'; +import * as deesWccTools from '../ts_web/index.js'; import * as deesDomTools from '@designestate/dees-domtools'; // elements and pages -import * as elements from '../test/elements'; -import * as pages from '../test/pages'; +import * as elements from '../test/elements/index.js'; +import * as pages from '../test/pages/index.js'; deesWccTools.setupWccTools(elements as any, pages); deesDomTools.elementBasic.setup(); diff --git a/npmextra.json b/npmextra.json index d079880..8407c62 100644 --- a/npmextra.json +++ b/npmextra.json @@ -5,7 +5,7 @@ "githost": "gitlab.com", "gitscope": "designestate", "gitrepo": "dees-wcctools", - "shortDescription": "wcc tools for creating element catalogues", + "description": "wcc tools for creating element catalogues", "npmPackagename": "@designestate/dees-wcctools", "license": "MIT", "projectDomain": "design.estate" diff --git a/package.json b/package.json index fadda96..9b925bf 100644 --- a/package.json +++ b/package.json @@ -43,4 +43,4 @@ "browserslist": [ "last 1 Chrome versions" ] -} +} \ No newline at end of file diff --git a/test/elements/test-demoelement.ts b/test/elements/test-demoelement.ts index 68a8daf..cb78b81 100644 --- a/test/elements/test-demoelement.ts +++ b/test/elements/test-demoelement.ts @@ -86,7 +86,7 @@ export class TestDemoelement extends DeesElement { border-radius: 50px; } `)} - + pre b { color: green; }