Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,16 @@ jobs:
recreate: true
path: code-coverage-results.md

front-end-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Run frontend lint
working-directory: ./openalprwebhookprocessor.client
run: |
npm ci
npm run lint

front-end-tests:
runs-on: ubuntu-latest
steps:
Expand All @@ -67,7 +77,6 @@ jobs:
run: |
npm ci
npm run test:prod
npm run lint

- name: Front End Code Coverage Report
uses: irongut/CodeCoverageSummary@v1.3.0
Expand Down
72 changes: 0 additions & 72 deletions openalprwebhookprocessor.client/.eslintrc.json

This file was deleted.

45 changes: 35 additions & 10 deletions openalprwebhookprocessor.client/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular/build:application",
"options": {
"outputPath": "dist/openalprwebhookprocessor.client",
"outputPath": {
"base": "dist/openalprwebhookprocessor.client"
},
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": [
"zone.js"
],
Expand Down Expand Up @@ -52,8 +53,8 @@
}
],
"scripts": [],
"serviceWorker": true,
"ngswConfigPath": "ngsw-config.json"
"serviceWorker": "ngsw-config.json",
"browser": "src/main.ts"
},
"configurations": {
"production": {
Expand All @@ -78,9 +79,7 @@
"outputHashing": "all"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
Expand All @@ -89,7 +88,7 @@
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"builder": "@angular/build:dev-server",
"configurations": {
"production": {
"buildTarget": "openalprwebhookprocessor.client:build:production"
Expand All @@ -104,13 +103,13 @@
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"builder": "@angular/build:extract-i18n",
"options": {
"buildTarget": "openalprwebhookprocessor.client:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"builder": "@angular/build:karma",
"options": {
"polyfills": [
"zone.js",
Expand Down Expand Up @@ -146,5 +145,31 @@
"schematicCollections": [
"@angular-eslint/schematics"
]
},
"schematics": {
"@schematics/angular:component": {
"type": "component"
},
"@schematics/angular:directive": {
"type": "directive"
},
"@schematics/angular:service": {
"type": "service"
},
"@schematics/angular:guard": {
"typeSeparator": "."
},
"@schematics/angular:interceptor": {
"typeSeparator": "."
},
"@schematics/angular:module": {
"typeSeparator": "."
},
"@schematics/angular:pipe": {
"typeSeparator": "."
},
"@schematics/angular:resolver": {
"typeSeparator": "."
}
}
}
71 changes: 71 additions & 0 deletions openalprwebhookprocessor.client/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import angularEslint from '@angular-eslint/eslint-plugin';
import angularTemplate from '@angular-eslint/eslint-plugin-template';
import angularParser from '@angular-eslint/template-parser';
import globals from "globals";
import tsParser from '@typescript-eslint/parser';
import tsEslintPlugin from '@typescript-eslint/eslint-plugin';
import stylistic from '@stylistic/eslint-plugin'

export default [
{
files: ['**/*.ts'],
languageOptions: {
globals: {
...globals.browser,
...globals.node,
},
parser: tsParser,
parserOptions: {
project: ['./tsconfig.json'],
tsconfigRootDir: import.meta.dirname,
sourceType: 'module',
},
},
plugins: {
'@typescript-eslint': tsEslintPlugin,
'@angular-eslint': angularEslint,
'@stylistic': stylistic,
},
rules: {
...tsEslintPlugin.configs.recommended.rules,
...angularEslint.configs.recommended.rules,
...tsEslintPlugin.configs.strict.rules,
...tsEslintPlugin.configs.stylistic.rules,
...stylistic.configs.recommended.rules
},
},
{
files: ['**/*.html'],
languageOptions: {
parser: angularParser,
},
plugins: {
'@angular-eslint/template': angularTemplate,
},
rules: {
...angularTemplate.configs.recommended.rules,
},
},
{
files: ['**/*.spec.ts'],
languageOptions: {
globals: {
...globals.jasmine,
},
parser: tsParser,
parserOptions: {
project: ['./tsconfig.spec.json'],
tsconfigRootDir: import.meta.dirname,
sourceType: 'module',
},
},
plugins: {
'@typescript-eslint': tsEslintPlugin,
'@angular-eslint': angularEslint,
},
rules: {
...tsEslintPlugin.configs.recommended.rules,
...angularEslint.configs.recommended.rules,
},
},
];
2 changes: 1 addition & 1 deletion openalprwebhookprocessor.client/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = function (config) {
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage'),
require('@angular-devkit/build-angular/plugins/karma')

],
client: {
jasmine: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<!-- Allows the build (or compile) script located on package.json to run on Build -->
<ShouldRunBuildScript>false</ShouldRunBuildScript>
<!-- Folder where production build objects will be placed -->
<PublishAssetsDirectory>$(MSBuildProjectDirectory)\dist\openalprwebhookprocessor.client\</PublishAssetsDirectory>
<PublishAssetsDirectory>$(MSBuildProjectDirectory)\dist\openalprwebhookprocessor.client\browser\</PublishAssetsDirectory>
</PropertyGroup>
</Project>
Loading
Loading