Skip to content

Commit

Permalink
Bug Angular: commit in generated app is in error
Browse files Browse the repository at this point in the history
  • Loading branch information
qmonmert committed Sep 15, 2024
1 parent 3149f14 commit ef8a1c6
Show file tree
Hide file tree
Showing 6 changed files with 94 additions and 50 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class AngularModuleFactory {
public JHipsterModule buildModule(JHipsterModuleProperties properties) {
//@formatter:off
return moduleBuilder(properties)
.preCommitActions(stagedFilesFilter("{src/**/,}*.ts"), preCommitCommands("eslint --fix", "prettier --write"))
.preCommitActions(stagedFilesFilter("{src/**/,}*.ts"), preCommitCommands("eslint --fix"))
.gitIgnore()
.comment("Angular")
.pattern(".angular/")
Expand Down Expand Up @@ -56,12 +56,15 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
.addDevDependency(packageName("@angular/compiler-cli"), ANGULAR, ANGULAR_CORE_PACKAGE)
.addDevDependency(packageName("@types/node"), COMMON)
.addDevDependency(packageName("@types/jest"), COMMON)
.addDevDependency(packageName("angular-eslint"), ANGULAR)
.addDevDependency(packageName("globals"), COMMON)
.addDevDependency(packageName("jest"), COMMON)
.addDevDependency(packageName("jest-environment-jsdom"), ANGULAR)
.addDevDependency(packageName("ts-jest"), COMMON)
.addDevDependency(packageName("jest-preset-angular"), ANGULAR)
.addDevDependency(packageName("jest-sonar-reporter"), ANGULAR)
.addDevDependency(packageName("typescript"), ANGULAR)
.addDevDependency(packageName("typescript-eslint"), COMMON)
.addDevDependency(packageName("npm-run-all2"), COMMON)
.addScript(scriptKey("ng"), scriptCommand("ng"))
.addScript(scriptKey("start"), scriptCommand("ng serve"))
Expand All @@ -72,15 +75,14 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
.addScript(scriptKey("test"), scriptCommand("npm run watch:test"))
.addScript(scriptKey("test:coverage"), scriptCommand("ng test --coverage"))
.addScript(scriptKey("watch:test"), scriptCommand("ng test --watch"))
.addScript(scriptKey("lint"), scriptCommand("ng lint"))
.addScript(scriptKey("lint"), scriptCommand("eslint ."))
.and()
.files()
.add(SOURCE.template("angular.json"), to("angular.json"))
.add(SOURCE.file("tsconfig.json"), to("tsconfig.json"))
.add(SOURCE.file("tsconfig.app.json"), to("tsconfig.app.json"))
.add(SOURCE.file(".eslintrc.json"), to(".eslintrc.json"))
.add(SOURCE.file("eslint.config.mjs"), to("eslint.config.mjs"))
.batch(SOURCE_COMMON, to("."))
.addFile(".eslintignore")
.addFile(".npmrc")
.and()
.batch(SOURCE, to("."))
Expand Down
36 changes: 0 additions & 36 deletions src/main/resources/generator/client/angular/core/.eslintrc.json

This file was deleted.

81 changes: 81 additions & 0 deletions src/main/resources/generator/client/angular/core/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
import globals from 'globals';
import tseslint from 'typescript-eslint';
import eslint from '@eslint/js';
import angular from 'angular-eslint';

export default tseslint.config(
{
languageOptions: {
globals: {
...globals.node,
},
},
},
{ ignores: [
'node_modules/',
'src/main/docker/',
'src/test/webapp/cypress/',
'src/test/webapp/protractor.conf.js',
'jest.conf.js',
'src/test/webapp/jest.conf.js',
'webpack/',
'target/',
'build/',
'node/',
'postcss.config.js'
] },
eslint.configs.recommended,
{
files: ['src/main/webapp/**/*.ts'],
extends: [...tseslint.configs.strictTypeChecked, ...tseslint.configs.stylistic, ...angular.configs.tsRecommended],
languageOptions: {
globals: {
...globals.browser,
},
parserOptions: {
project: ['./tsconfig.app.json', './tsconfig.spec.json'],
},
},
processor: {
// https://github.com/angular-eslint/angular-eslint/issues/1917
meta: {
name: 'extract-inline-html',
},
...angular.processInlineTemplates,
},
rules: {
'@angular-eslint/component-selector': [
'error',
{
type: 'element',
prefix: 'jhi',
style: 'kebab-case',
},
],
'@angular-eslint/directive-selector': [
'error',
{
type: 'attribute',
prefix: 'jhi',
style: 'camelCase',
},
],
'@typescript-eslint/unbound-method': 'off',
'@typescript-eslint/no-floating-promises': 'off',
'@typescript-eslint/no-extraneous-class': 'off',
'@typescript-eslint/no-confusing-void-expression': 'off',
'@typescript-eslint/no-unsafe-assignment': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
'@typescript-eslint/no-unsafe-member-access': 'off',
'@typescript-eslint/no-unsafe-argument': 'off',
'@typescript-eslint/consistent-type-definitions': 'off',
'@typescript-eslint/use-unknown-in-catch-callback-variable': 'off',
},
},
{
files: ['**/*.html'],
extends: [...angular.configs.templateRecommended, ...angular.configs.templateAccessibility],
rules: {},
},
);
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"@angular/cdk": "18.2.3",
"@angular/core": "18.2.4",
"@angular/material": "18.2.3",
"angular-eslint": "18.3.1",
"keycloak-js": "25.0.5",
"rxjs": "7.8.1",
"tslib": "2.7.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ void shouldCreateAngularModule() {
.containing(nodeDependency("@angular-eslint/template-parser"))
.containing(nodeDependency("@typescript-eslint/eslint-plugin"))
.containing(nodeDependency("@typescript-eslint/parser"))
.containing(nodeDependency("angular-eslint"))
.containing(nodeDependency("eslint"))
.containing(nodeDependency("globals"))
.containing(nodeDependency("typescript-eslint"))
.containing(nodeDependency("npm-run-all2"))
.containing(nodeScript("ng", "ng"))
.containing(nodeScript("watch", "npm-run-all --parallel watch:*"))
Expand All @@ -56,7 +59,7 @@ void shouldCreateAngularModule() {
.containing(nodeScript("test", "npm run watch:test"))
.containing(nodeScript("watch:test", "ng test --watch"))
.containing(nodeScript("test:coverage", "ng test --coverage"))
.containing(nodeScript("lint", "ng lint"))
.containing(nodeScript("lint", "eslint ."))
.containing(" \"jestSonar\": {\n \"reportPath\": \"target/test-results\",\n \"reportFile\": \"TESTS-results-sonar.xml\"\n }")
.and()
.hasFile(".gitignore")
Expand All @@ -67,7 +70,7 @@ void shouldCreateAngularModule() {
.containing(
"""
module.exports = {
'{src/**/,}*.ts': ['eslint --fix', 'prettier --write'],
'{src/**/,}*.ts': 'eslint --fix',
'*.{md,json,yml,html,css,scss,java,xml,feature}': ['prettier --write'],
};
"""
Expand All @@ -85,8 +88,7 @@ void shouldCreateAngularModule() {
"tsconfig.spec.json",
"proxy.conf.json",
".npmrc",
".eslintignore",
".eslintrc.json"
"eslint.config.mjs"
)
.hasPrefixedFiles(
"src/main/webapp/app",
Expand Down
6 changes: 0 additions & 6 deletions src/test/resources/projects/angular/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,6 @@
"options": {
"buildTarget": "project:build"
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
}
}
}
}
Expand Down

0 comments on commit ef8a1c6

Please sign in to comment.