Skip to content

Commit

Permalink
Merge branch 'refs/heads/master' into https
Browse files Browse the repository at this point in the history
# Conflicts:
#	frontend/src/environments/environment.development.ts
  • Loading branch information
koeltv committed Jul 8, 2024
2 parents 4d6e71b + def5033 commit 262c8ef
Show file tree
Hide file tree
Showing 46 changed files with 2,836 additions and 600 deletions.
2 changes: 1 addition & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ENV NG_CLI_ANALYTICS="false"
COPY package.json package-lock.json ./
RUN ["npm", "ci"]
# Copy Angular files
COPY angular.json tsconfig.app.json tsconfig.json tsconfig.spec.json ngsw-config.json ./
COPY angular.json tsconfig.app.json tsconfig.json tsconfig.spec.json ngsw-config.json eslint.config.js ./
# Copy the source code & resources
COPY m3-theme.scss m3-theme.scss
COPY public public
Expand Down
14 changes: 13 additions & 1 deletion frontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,23 @@
],
"scripts": []
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
}
}
}
}
},
"cli": {
"analytics": false
"analytics": false,
"schematicCollections": [
"@angular-eslint/schematics"
]
}
}
73 changes: 73 additions & 0 deletions frontend/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
// @ts-check
const eslint = require("@eslint/js");
const tseslint = require("typescript-eslint");
const angular = require("angular-eslint");

module.exports = tseslint.config(
{
files: ["**/*.ts"],
extends: [
eslint.configs.recommended,
...tseslint.configs.recommended,
...tseslint.configs.stylistic,
...angular.configs.tsAll,
],
processor: angular.processInlineTemplates,
rules: {
"@angular-eslint/directive-selector": [
"error",
{
type: "attribute",
prefix: "app",
style: "camelCase",
},
],
"@angular-eslint/component-selector": [
"error",
{
type: "element",
prefix: "app",
style: "kebab-case",
},
],
"@typescript-eslint/no-inferrable-types": "off",
"@typescript-eslint/no-shadow": "error",
"@typescript-eslint/no-unused-vars": [
"error",
{
vars: 'all',
argsIgnorePattern: '^_'
},
],
"@angular-eslint/prefer-on-push-component-change-detection": "off",
"@/semi": "error",
"@/quotes": ["error", "single"],
"@/eol-last": "error",
"@/indent": [
"error",
2,
{
SwitchCase: 1
}
]
},
},
{
files: ["**/*.html"],
extends: [
...angular.configs.templateRecommended,
...angular.configs.templateAccessibility,
],
rules: {},
},
{
files: ["**/*.component.html"],
extends: [
...angular.configs.templateRecommended,
...angular.configs.templateAccessibility,
],
rules: {
"@angular-eslint/template/prefer-self-closing-tags": ["error"]
},
}
);
Loading

0 comments on commit 262c8ef

Please sign in to comment.