Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #6155

Merged
merged 42 commits into from
Aug 15, 2024
Merged

Dev #6155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
9dac9a4
feat(Dependencies): Update dependency cssnano to v7
renovate[bot] Aug 14, 2024
ec75796
fix(Linting):blacked code
renovate[bot] Aug 14, 2024
48ea1f9
Merge pull request #6139 from deNBI/fix(linting)_deps-cssnano-7.x
dweinholz Aug 14, 2024
e9edac9
Merge branch 'dev' into deps/cssnano-7.x
dweinholz Aug 15, 2024
42a7b94
fixed linting
dweinholz Aug 15, 2024
610234a
Merge pull request #6075 from deNBI/deps/cssnano-7.x
dweinholz Aug 15, 2024
07063fe
feat(Dependencies): Update all non-major dependencies to v18.1.5
renovate[bot] Aug 15, 2024
bffbc73
feat(Dependencies): Update all non-major dependencies
renovate[bot] Aug 15, 2024
d465574
Merge pull request #6083 from deNBI/deps/all-minor-patch
dweinholz Aug 15, 2024
1cf4b38
feat(Dependencies): Update dependency eslint-plugin-jsdoc to v50
renovate[bot] Aug 15, 2024
39880e7
feat(Dependencies): Update docker/build-push-action action to v6
renovate[bot] Aug 15, 2024
faaaf25
Merge pull request #6133 from deNBI/deps/docker-build-push-action-6.x
dweinholz Aug 15, 2024
aa2ce92
Merge branch 'dev' into deps/eslint-plugin-jsdoc-50.x
dweinholz Aug 15, 2024
0f71f4f
feat(Dependencies): Update dependency ngx-scrollbar to v15
renovate[bot] Aug 15, 2024
75fe50e
Merge pull request #6128 from deNBI/deps/eslint-plugin-jsdoc-50.x
dweinholz Aug 15, 2024
0540056
Merge branch 'dev' into deps/ngx-scrollbar-15.x
dweinholz Aug 15, 2024
6f8cb62
feat(Dependencies): Update dependency angulartics2 to v14
renovate[bot] Aug 15, 2024
ef22afc
feat(Dependencies): Update dependency ngx-scrollbar to v15
renovate[bot] Aug 15, 2024
2d69bca
updated husky command
dweinholz Aug 15, 2024
4238341
updated husky command
dweinholz Aug 15, 2024
777017f
Merge branch 'deps/ngx-scrollbar-15.x' of github.com:deNBI/cloud-port…
dweinholz Aug 15, 2024
e61604c
Merge pull request #6132 from deNBI/deps/ngx-scrollbar-15.x
dweinholz Aug 15, 2024
8db8520
Merge branch 'dev' into deps/angulartics2-14.x
dweinholz Aug 15, 2024
b55ca45
feat(Dependencies): Update dependency audit-ci to v7
renovate[bot] Aug 15, 2024
016d069
Merge pull request #6126 from deNBI/deps/angulartics2-14.x
dweinholz Aug 15, 2024
f501a3f
Merge branch 'dev' into deps/audit-ci-7.x
dweinholz Aug 15, 2024
d81819a
feat(Dependencies): Update typescript-eslint monorepo to v8
renovate[bot] Aug 15, 2024
c6738cd
fix(Linting):blacked code
renovate[bot] Aug 15, 2024
dd973cb
Merge pull request #6154 from deNBI/fix(linting)_deps-major-typescrip…
dweinholz Aug 15, 2024
15ac2b3
Merge pull request #6134 from deNBI/deps/major-typescript-eslint-mono…
dweinholz Aug 15, 2024
11e67d8
Merge branch 'dev' into deps/audit-ci-7.x
dweinholz Aug 15, 2024
5c95ace
feat(Dependencies): Update dependency eslint to v9
renovate[bot] Aug 15, 2024
55666c3
fixed update
dweinholz Aug 15, 2024
14a8cbf
fixed linting
dweinholz Aug 15, 2024
9934d8c
fixed linting
dweinholz Aug 15, 2024
4494a56
fixed linting
dweinholz Aug 15, 2024
410064a
fixed linting
dweinholz Aug 15, 2024
cc6c0ea
Merge pull request #6127 from deNBI/deps/audit-ci-7.x
dweinholz Aug 15, 2024
3558eec
Merge branch 'dev' into deps/major-eslint-monorepo
dweinholz Aug 15, 2024
8948b2d
fixed linting
dweinholz Aug 15, 2024
583590d
Updated for eslint 9
dweinholz Aug 15, 2024
a7b429b
Merge pull request #6086 from deNBI/deps/major-eslint-monorepo
dweinholz Aug 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .eslintignore

This file was deleted.

7 changes: 5 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"extends": [
"plugin:@angular-eslint/template/process-inline-templates",
"eslint:recommended",
"airbnb-base",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking"
],
Expand All @@ -28,6 +27,9 @@
"@typescript-eslint"
],
"rules": {
"import/newline-after-import": "off",
"import/no-named-as-default": "off",
"import/no-named-as-default-member": "off",

"@angular-eslint/directive-selector": [
"error",
Expand Down Expand Up @@ -59,7 +61,7 @@
],
"no-shadow": "off",
"@typescript-eslint/no-shadow": "warn",
"require-jsdoc": "warn",
// "require-jsdoc": "warn",
"guard-for-in": "off",
"jsdoc/newline-after-description": "off",
"jsdoc/no-types": "off",
Expand Down Expand Up @@ -171,6 +173,7 @@
"import/no-unresolved": "off",
"import/no-mutable-exports": "off",
"import/extensions": "off",
"import/no-amd": "off",
"import/no-extraneous-dependencies": "off",
"indent": [
"error",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/LintingAutoFix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Create Pull Request
if: steps.git-check.outputs.modified == 'true'
id: cpr
uses: peter-evans/create-pull-request@v6.0.5
uses: peter-evans/create-pull-request@v6.1.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: fix(Linting):blacked code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_TOKEN }}
- name: Build and publish image to Quay
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
file: Dockerfile
push: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_TOKEN }}
- name: Build and publish image to Quay
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
file: Dockerfile
push: true
Expand Down
3 changes: 1 addition & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged
npx lint-staged
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ COPY . .
RUN npx ng build --configuration=custom

### STAGE 2: Setup
FROM nginx:1.26.1-alpine
FROM nginx:1.27.0-alpine

# Copy our default nginx config
COPY nginx/default.conf /etc/nginx/conf.d/
Expand Down
203 changes: 203 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
import noNull from "eslint-plugin-no-null";
import typescriptEslint from "@typescript-eslint/eslint-plugin";
import path from "node:path";
import { fileURLToPath } from "node:url";
import js from "@eslint/js";
import { FlatCompat } from "@eslint/eslintrc";

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all
});

export default [{
ignores: ["projects/**/*", "**/package-lock.json","node_modules/**","build/**","dist/**","res/**","coverage/**"],
}, ...compat.extends(
"plugin:@angular-eslint/template/process-inline-templates",
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking",
).map(config => ({
...config,
files: ["**/*.ts"],
})), {
files: ["**/*.ts"],

plugins: {
"no-null": noNull,
"@typescript-eslint": typescriptEslint,
},

languageOptions: {
ecmaVersion: 5,
sourceType: "script",

parserOptions: {
project: ["tsconfig.json", "e2e/tsconfig.e2e.json"],
createDefaultProgram: true,
},
},

rules: {
"import/newline-after-import": "off",
"import/no-named-as-default": "off",
"import/no-named-as-default-member": "off",
"@angular-eslint/directive-selector": "off",
"@angular-eslint/no-forward-ref": "off",
"no-return-await": "off",
"@typescript-eslint/naming-convention": "off",
"@typescript-eslint/ban-types": "off",
camelcase: "off",
"class-methods-use-this": "off",
"dot-notation": "off",
eqeqeq: "error",
"lines-between-class-members": "off",
"padded-blocks": "off",

"max-len": ["error", {
code: 200,
ignoreComments: true,
ignoreUrls: true,
ignoreTemplateLiterals: true,
ignoreRegExpLiterals: true,
}],

"no-shadow": "off",
"@typescript-eslint/no-shadow": "warn",
"guard-for-in": "off",
"jsdoc/newline-after-description": "off",
"jsdoc/no-types": "off",
"@typescript-eslint/consistent-type-assertions": "warn",
"@typescript-eslint/no-unsafe-enum-comparison": "off",

"@typescript-eslint/array-type": ["error", {
default: "array",
}],

"@typescript-eslint/await-thenable": "error",
"@typescript-eslint/consistent-type-definitions": "error",
"@typescript-eslint/dot-notation": "off",

"@typescript-eslint/explicit-member-accessibility": ["off", {
accessibility: "explicit",
}],

"@typescript-eslint/member-delimiter-style": ["off", {
multiline: {
delimiter: "none",
requireLast: true,
},

singleline: {
delimiter: "semi",
requireLast: false,
},
}],

"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": ["error"],
"@typescript-eslint/member-ordering": "off",
"@typescript-eslint/no-floating-promises": "error",
"@typescript-eslint/no-for-in-array": "off",
"@typescript-eslint/no-inferrable-types": "off",
"@typescript-eslint/no-require-imports": "error",
"@typescript-eslint/no-unnecessary-qualifier": "error",
"@typescript-eslint/no-var-requires": "error",
"@typescript-eslint/no-unsafe-assignment": "off",
"@typescript-eslint/no-unsafe-member-access": "off",
"@typescript-eslint/restrict-template-expressions": "off",
"@typescript-eslint/no-explicit-any": "off",
" @typescript-eslint/no-empty-function": "off",
"@angular-eslint/component-selector": "off",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-unsafe-return": "off",
"@typescript-eslint/no-unsafe-call": "off",
"no-console": "off",

"@typescript-eslint/ban-ts-comment": ["off", {
"ts-ignore": "allow-with-description",
}],

"@typescript-eslint/no-implied-eval": "off",
"@typescript-eslint/no-misused-promises": "off",
"@typescript-eslint/require-await": "off",
"no-empty": "off",
"no-unused-expressions": "off",
"@typescript-eslint/no-unsafe-argument": "off",

"@typescript-eslint/unbound-method": ["off", {
ignoreStatic: true,
}],

"@typescript-eslint/promise-function-async": "error",
"@typescript-eslint/restrict-plus-operands": "error",
"@typescript-eslint/semi": ["off", null],
"@typescript-eslint/strict-boolean-expressions": "off",
"arrow-parens": ["off", "always"],
"brace-style": ["error", "1tbs"],
"comma-dangle": "error",
"default-case": "warn",
"default-param-last": "off",
"id-blacklist": "off",
"id-match": "off",
"import/no-default-export": "off",
"import/prefer-default-export": "off",
"import/no-unassigned-import": "off",
"import/no-unresolved": "off",
"import/no-mutable-exports": "off",
"import/extensions": "off",
"import/no-amd": "off",
"import/no-extraneous-dependencies": "off",

indent: ["error", "tab", {
SwitchCase: 1,
}],

"linebreak-style": "error",
"max-lines": "off",
"no-continue": "off",
"no-constant-condition": "error",
"no-control-regex": "warn",
"no-else-return": "off",
"no-invalid-regexp": "error",
"no-invalid-this": "off",
"no-irregular-whitespace": "error",
"no-multiple-empty-lines": "error",
"@angular-eslint/no-empty-lifecycle-method": "off",
"no-empty-function": "off",
"no-null/no-null": "off",
"no-nested-ternary": "off",
"no-param-reassign": "off",
"no-redeclare": "error",
"no-regex-spaces": "error",
"no-restricted-syntax": ["off", "ForInStatement"],
"no-sparse-arrays": "error",
"no-tabs": "off",
"no-template-curly-in-string": "error",
"no-underscore-dangle": "off",
"no-use-before-define": "off",
"no-useless-constructor": "off",
"no-void": "off",
"@typescript-eslint/no-useless-constructor": ["error"],
"no-mixed-spaces-and-tabs": [2, "smart-tabs"],

"padding-line-between-statements": ["error", {
blankLine: "always",
prev: "*",
next: "return",
}],

"prefer-arrow/prefer-arrow-functions": "off",
"prefer-template": "error",
"prefer-destructuring": "off",
},
}, ...compat.extends("plugin:@angular-eslint/template/recommended").map(config => ({
...config,
files: ["**/*.html"],
})), {
files: ["**/*.html"],
rules: {},
}];
Loading
Loading