From 134dd0414fab32a240901cb2aeb7ae927da6ce00 Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Thu, 24 Mar 2022 16:10:03 +0100 Subject: [PATCH] fix(core): update --- .gitlab-ci.yml | 7 +++++-- .vscode/launch.json | 24 +++--------------------- html/index.html | 2 +- html/index.ts | 4 ++-- package.json | 2 +- 5 files changed, 12 insertions(+), 27 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b40a17..38aaff0 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 # ==================== @@ -37,6 +40,7 @@ auditProductionDependencies: tags: - lossless - docker + allow_failure: true auditDevDependencies: image: registry.gitlab.com/hosttoday/ht-docker-node:npmci @@ -102,10 +106,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 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/package.json b/package.json index 0a25d33..792052f 100644 --- a/package.json +++ b/package.json @@ -43,4 +43,4 @@ "browserslist": [ "last 1 Chrome versions" ] -} +} \ No newline at end of file