From 0ce9d1af2690bf29cce90d87bfb1cfb4a38178c9 Mon Sep 17 00:00:00 2001 From: Henry Taeschner Date: Sat, 30 Dec 2023 07:56:42 +0100 Subject: [PATCH] fix: added husky pre-commit files, extend *ignore* lists --- .dockerignore | 5 ++--- .eslintrc.json | 1 + .gitignore | 1 + .gitlab-ci.yml | 16 ---------------- .husky/commit-msg | 4 ++++ .husky/pre-commit | 7 +++++++ .prettierignore | 2 ++ 7 files changed, 17 insertions(+), 19 deletions(-) delete mode 100644 .gitlab-ci.yml create mode 100755 .husky/commit-msg create mode 100755 .husky/pre-commit diff --git a/.dockerignore b/.dockerignore index 26377f4..ea60927 100644 --- a/.dockerignore +++ b/.dockerignore @@ -26,13 +26,12 @@ # misc /.sass-cache +/.gitlab* /connect.lock /coverage /libpeerconnection.log -npm-debug.log -testem.log /typings -yarn-error.log +*.log # e2e /e2e/*.js diff --git a/.eslintrc.json b/.eslintrc.json index 301bf85..0e3111e 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -3,6 +3,7 @@ "ignorePatterns": [ ".angular/**", ".husky/**", + ".github/**", "coverage/**", "dist/**", "helm/**", diff --git a/.gitignore b/.gitignore index b75ca20..91cce99 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ speed-measure-plugin*.json # misc /.angular/cache /.sass-cache +/.gitlab* /connect.lock /coverage /libpeerconnection.log diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 35ac51e..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,16 +0,0 @@ -variables: - # docker image for the npm build and test - NPM_BUILD_IMAGE: harbor.1000kit.org/1000kit/node-build:v16 - -include: - - project: '1000kit/infra/ci/angular' - ref: 'v1' - file: 'ci.yml' - -npm:build: - before_script: - - npm ci --force --cache .npm --prefer-offline - -npm:test: - before_script: - - npm ci --force --cache .npm --prefer-offline diff --git a/.husky/commit-msg b/.husky/commit-msg new file mode 100755 index 0000000..e8511ea --- /dev/null +++ b/.husky/commit-msg @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +npx --no-install commitlint --edit $1 diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100755 index 0000000..c96ff6e --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,7 @@ +#!/usr/bin/env sh +. "$(dirname -- "$0")/_/husky.sh" + +echo "[Husky] Running lint check:" +npm run lint +echo "[Husky] Running prettier check:" +npx prettier -c . diff --git a/.prettierignore b/.prettierignore index 4d7a3c1..3bc9d3c 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,7 +1,9 @@ .angular/** .husky/** .docusaurus/ +.github/** .prettierignore +.browserslistrc coverage/** dist/** helm/**