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
52 changes: 18 additions & 34 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,11 @@
"outputPath": "dist/angular-library-playground",
"index": "src/index.html",
"browser": "src/main.ts",
"polyfills": [
"zone.js"
],
"polyfills": ["zone.js"],
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "css",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.css"
],
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["src/styles.css"],
"scripts": []
},
"configurations": {
Expand All @@ -54,6 +47,12 @@
"optimization": false,
"extractLicenses": false,
"sourceMap": true
},
"testing": {
"aot": false,
"optimization": false,
"extractLicenses": false,
"polyfills": ["zone.js", "zone.js/testing"]
}
},
"defaultConfiguration": "production"
Expand All @@ -77,52 +76,37 @@
}
},
"test": {
"builder": "@angular/build:karma",
"builder": "@angular/build:unit-test",
"options": {
"polyfills": [
"zone.js",
"zone.js/testing"
],
"tsConfig": "tsconfig.spec.json",
"inlineStyleLanguage": "css",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.css"
],
"scripts": []
"buildTarget": ":build:testing",
"runner": "vitest"
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html",
"projects/**/*.ts",
"projects/**/*.html"
]
"lintFilePatterns": ["src/**/*.ts", "src/**/*.html", "projects/**/*.ts", "projects/**/*.html"]
}
}
}
},
"angular-components": {
"projectType": "library",
"root": "projects/angular-components",
"sourceRoot": "projects/angular-components/src",
"prefix": "ff",
"schematics": {
"@schematics/angular:component": {
"style": "css"
}
},
"root": "projects/angular-components",
"sourceRoot": "projects/angular-components/src",
"prefix": "ff",
"architect": {
"build": {
"builder": "@angular/build:ng-packagr",
"options": {
"project": "projects/angular-components/ng-package.json"
"project": "projects/angular-components/ng-package.json",
"tsConfig": "tsconfig.lib.json"
}
}
}
Expand Down
142 changes: 75 additions & 67 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,35 +1,71 @@
import typescriptParser from '@typescript-eslint/parser';
// @ts-check
import eslint from '@eslint/js';
import { defineConfig } from 'eslint/config';
import tseslint from 'typescript-eslint';
import angular from 'angular-eslint';
import prettierPlugin from 'eslint-plugin-prettier';
import tsPlugin from '@typescript-eslint/eslint-plugin';
import angularPlugin from '@angular-eslint/eslint-plugin';
import angularTemplate from '@angular-eslint/eslint-plugin-template';
import angularTemplateParser from '@angular-eslint/template-parser';
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
import eslintPluginUnicorn from 'eslint-plugin-unicorn';
import js from '@eslint/js';
import eslintConfigPrettier from 'eslint-config-prettier';
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
import eslintPluginUnicorn from 'eslint-plugin-unicorn';

export default [
export default defineConfig([
// Unicorn: https://github.com/sindresorhus/eslint-plugin-unicorn
eslintPluginUnicorn.configs.recommended,
{
ignores: ['.cache/', '.git/', '.github/', 'node_modules/'],
rules: {
'unicorn/prevent-abbreviations': 'warn',
'unicorn/no-array-reduce': 'off',
'unicorn/prefer-ternary': 'warn',
'unicorn/no-null': 'off',
'unicorn/prefer-dom-node-text-content': 'warn',
'unicorn/consistent-function-scoping': [
'error',
{
checkArrowFunctions: false,
},
],
'unicorn/consistent-class-member-order': 'off', // handled by @typescript-eslint/member-ordering
'unicorn/prefer-object-iterable-methods': 'off',
'unicorn/name-replacements': [
'warn',
{
replacements: { configuration: false, util: false },
},
],
'unicorn/prefer-await': 'off', // preferably only if the function works better as async
'unicorn/consistent-boolean-name': 'off',
'unicorn/no-empty-file': 'off',
'unicorn/single-line-block-comment-style': 'off',
'unicorn/prefer-promise-try': 'warn',

'unicorn/no-useless-template-literals': 'off', // doesnt work nice with angular templates
'unicorn/no-incorrect-template-string-interpolation': 'off', // doesnt work nice with angular templates
'unicorn/prefer-string-raw': 'off', // doesnt work nice with angular templates
},
},
eslintPluginPrettierRecommended,
// SonarJS: https://github.com/SonarSource/SonarJS/blob/master/packages/jsts/src/rules/README.md
// sonarjs.configs.recommended,
// {
// rules: {
// 'sonarjs/cognitive-complexity': 'error',
// 'sonarjs/no-duplicate-string': 'error',
// },
// },
{
files: ['**/*.ts'],
languageOptions: {
parser: typescriptParser,
parserOptions: {
project: ['./tsconfig.json', './tsconfig.app.json', './tsconfig.spec.json'],
},
},
extends: [
eslint.configs.recommended,
tseslint.configs.recommended,
tseslint.configs.stylistic,
angular.configs.tsRecommended,
],
plugins: {
'@typescript-eslint': tsPlugin,
'@angular-eslint': angularPlugin,
prettier: prettierPlugin,
},
processor: angular.processInlineTemplates,
rules: {
// TypeScript: https://typescript-eslint.io/rules/
...tsPlugin.configs.recommended.rules,
...tsPlugin.configs.stylistic.rules,
'@typescript-eslint/explicit-function-return-type': 'error',
'@typescript-eslint/triple-slash-reference': 'warn',
'@typescript-eslint/member-ordering': [
Expand All @@ -54,7 +90,9 @@ export default [
'public-instance-field',
'protected-instance-field',
'private-instance-field',
'private-instance-readonly-field',
'#private-instance-field',
'#private-instance-readonly-field',

'public-abstract-field',
'protected-abstract-field',
Expand Down Expand Up @@ -119,13 +157,14 @@ export default [
['private-static-get', 'private-static-set'],
['#private-static-get', '#private-static-set'],

['public-decorated-get', 'public-decorated-set'],
['protected-decorated-get', 'protected-decorated-set'],
['private-decorated-get', 'private-decorated-set'],

['public-instance-get', 'public-instance-set'],
['protected-instance-get', 'protected-instance-set'],
['private-instance-get', 'private-instance-set'],
['public-decorated-get', 'public-decorated-set', 'public-instance-get', 'public-instance-set'],
[
'protected-decorated-get',
'protected-decorated-set',
'protected-instance-get',
'protected-instance-set',
],
['private-decorated-get', 'private-decorated-set', 'private-instance-get', 'private-instance-set'],
['#private-instance-get', '#private-instance-set'],

['public-abstract-get', 'public-abstract-set'],
Expand Down Expand Up @@ -193,9 +232,9 @@ export default [
],

// Angular: https://github.com/angular-eslint/angular-eslint/blob/main/packages/eslint-plugin/README.md
...angularPlugin.configs.recommended.rules,
'@angular-eslint/directive-selector': ['off', { type: 'attribute', style: 'camelCase' }],
'@angular-eslint/component-selector': ['error', { type: 'element', prefix: 'ff', style: 'kebab-case' }],
'@angular-eslint/directive-selector': ['error', { type: 'attribute', prefix: ['app', 'ff'], style: 'camelCase' }],
'@angular-eslint/component-selector': ['error', { type: 'element', prefix: ['app', 'ff'], style: 'kebab-case' }],
'@angular-eslint/prefer-on-push-component-change-detection': 'warn',

// EcmaScript: https://eslint.org/docs/latest/rules/
...js.configs.recommended.rules,
Expand All @@ -206,22 +245,19 @@ export default [
// Prettier: https://github.com/prettier/eslint-config-prettier?tab=readme-ov-file#special-rules
...eslintConfigPrettier.rules,
'prettier/prettier': 'warn',

'unicorn/no-useless-template-literals': 'error', // turn on for ts files only
'unicorn/no-incorrect-template-string-interpolation': 'error', // turn on for ts files only
'unicorn/prefer-string-raw': 'error', // turn on for ts files only
},
},
{
files: ['**/*.html'],
languageOptions: {
parser: angularTemplateParser,
},
extends: [angular.configs.templateRecommended, angular.configs.templateAccessibility],
plugins: {
'@angular-eslint': angularPlugin,
'@angular-eslint/template': angularTemplate,
prettier: prettierPlugin,
},
rules: {
// Angular template: https://github.com/angular-eslint/angular-eslint/blob/main/packages/eslint-plugin-template/README.md
...angularTemplate.configs.recommended.rules,
...angularTemplate.configs.accessibility.rules,
'@angular-eslint/template/prefer-self-closing-tags': 'error',
'@angular-eslint/template/no-interpolation-in-attributes': ['error'],
'@angular-eslint/template/click-events-have-key-events': 'off',
Expand All @@ -231,8 +267,6 @@ export default [
allowList: ['li'],
},
],
'@angular-eslint/contextual-decorator': 'warn',
'@angular-eslint/prefer-signals': 'error',
'@angular-eslint/template/attributes-order': [
'error',
{
Expand All @@ -253,30 +287,4 @@ export default [
'prettier/prettier': ['error', { parser: 'angular' }],
},
},
// Unicorn: https://github.com/sindresorhus/eslint-plugin-unicorn
eslintPluginUnicorn.configs.recommended,
{
rules: {
'unicorn/prevent-abbreviations': 'warn',
'unicorn/no-array-reduce': 'off',
'unicorn/prefer-ternary': 'warn',
'unicorn/no-null': 'off',
'unicorn/prefer-dom-node-text-content': 'warn',
'unicorn/consistent-function-scoping': [
'error',
{
checkArrowFunctions: false,
},
],
},
},
eslintPluginPrettierRecommended,
// SonarJS: https://github.com/SonarSource/SonarJS/blob/master/packages/jsts/src/rules/README.md
// sonarjs.configs.recommended,
// {
// rules: {
// 'sonarjs/cognitive-complexity': 'error',
// 'sonarjs/no-duplicate-string': 'error',
// },
// },
];
]);
68 changes: 31 additions & 37 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,52 +13,46 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^20.3.16",
"@angular/cdk": "^20.2.14",
"@angular/common": "^20.3.16",
"@angular/compiler": "^20.3.16",
"@angular/core": "^20.3.16",
"@angular/forms": "^20.3.16",
"@angular/platform-browser": "^20.3.16",
"@angular/platform-browser-dynamic": "^20.3.16",
"@angular/router": "^20.3.16",
"@angular/animations": "^22.1.1",
"@angular/cdk": "^22.1.1",
"@angular/common": "^22.1.1",
"@angular/compiler": "^22.1.1",
"@angular/core": "^22.1.1",
"@angular/forms": "^22.1.1",
"@angular/platform-browser": "^22.1.1",
"@angular/router": "^22.1.1",
"rxjs": "~7.8.2",
"tailwindcss": "^4.1.18",
"tailwindcss": "^4.3.3",
"tslib": "^2.8.1",
"zone.js": "~0.15.1"
"zone.js": "~0.16.2"
},
"devDependencies": {
"@angular-eslint/builder": "^20.7.0",
"@angular-eslint/eslint-plugin": "^20.7.0",
"@angular-eslint/eslint-plugin-template": "^20.7.0",
"@angular-eslint/schematics": "^20.7.0",
"@angular-eslint/template-parser": "^20.7.0",
"@angular/build": "^20.3.15",
"@angular/cli": "^20.3.15",
"@angular/compiler-cli": "^20.3.16",
"@eslint/js": "^9.39.2",
"@tailwindcss/postcss": "^4.1.18",
"@types/jasmine": "~5.1.15",
"@typescript-eslint/eslint-plugin": "^8.54.0",
"@typescript-eslint/parser": "^8.54.0",
"angular-eslint": "^20.7.0",
"eslint": "^9.39.2",
"@angular/build": "^22.1.3",
"@angular/cli": "^22.1.3",
"@angular/compiler-cli": "^22.1.1",
"@eslint/js": "^10.0.1",
"@tailwindcss/postcss": "^4.3.3",
"@types/jasmine": "~6.0.0",
"angular-eslint": "^22.1.0",
"eslint": "^10.8.1",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-prettier": "^5.5.5",
"eslint-plugin-sonarjs": "^3.0.6",
"eslint-plugin-unicorn": "^57.0.0",
"jasmine-core": "^5.13.0",
"eslint-plugin-prettier": "^5.5.6",
"eslint-plugin-sonarjs": "^4.2.0",
"eslint-plugin-unicorn": "^73.0.0",
"istanbul-lib-instrument": "^6.0.3",
"jasmine-core": "^6.3.0",
"karma": "^6.4.4",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.1",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"ng-packagr": "^20.3.2",
"postcss": "^8.5.6",
"karma-jasmine-html-reporter": "~2.2.0",
"ng-packagr": "^22.1.1",
"postcss": "^8.5.26",
"postcss-cli": "^11.0.1",
"prettier": "^3.8.1",
"typescript": "~5.9.3",
"typescript-eslint": "^8.54.0"
"prettier": "^3.9.6",
"typescript": "~6.0.3",
"typescript-eslint": "^8.67.0",
"vitest": "^4.1.10"
},
"packageManager": "pnpm@10.28.2+sha512.41872f037ad22f7348e3b1debbaf7e867cfd448f2726d9cf74c08f19507c31d2c8e7a11525b983febc2df640b5438dee6023ebb1f84ed43cc2d654d2bc326264"
"packageManager": "pnpm@11.21.0+sha512.521705bce689924eac72f5a3587122f362689ef6571e55ba80076fd637c11132ecffada26fad4ea79c485bfddbfd3d5a2a5b05805a77e893de71ec8a6cca3bb1"
}
Loading