From fba9a0f1a44c9743b8bdbc22e1167d2d7cc43389 Mon Sep 17 00:00:00 2001 From: Igor Propisnov Date: Fri, 17 May 2024 13:44:07 +0200 Subject: [PATCH] update prettier and eslint --- frontend/.eslintrc.json | 6 +- frontend/.prettierrc.json | 3 +- frontend/package.json | 11 ++-- frontend/pnpm-lock.yaml | 60 +++++++++++++++++-- .../register-root/register-root.component.ts | 2 - 5 files changed, 67 insertions(+), 15 deletions(-) diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json index f3bf264..5d51529 100644 --- a/frontend/.eslintrc.json +++ b/frontend/.eslintrc.json @@ -1,7 +1,7 @@ { "root": true, "ignorePatterns": ["projects/**/*"], - "plugins": ["import"], + "plugins": ["import", "prettier"], "overrides": [ { "files": ["*.ts"], @@ -10,9 +10,11 @@ "plugin:@typescript-eslint/recommended", "plugin:@angular-eslint/recommended", "plugin:@angular-eslint/template/process-inline-templates", - "prettier" + "prettier", + "plugin:prettier/recommended" ], "rules": { + "prettier/prettier": ["error", { "printWidth": 80 }], "@angular-eslint/directive-selector": [ "error", { diff --git a/frontend/.prettierrc.json b/frontend/.prettierrc.json index 83e9063..bf45c66 100644 --- a/frontend/.prettierrc.json +++ b/frontend/.prettierrc.json @@ -4,5 +4,6 @@ "semi": true, "endOfLine": "auto", "bracketSameLine": true, - "htmlWhitespaceSensitivity": "ignore" + "htmlWhitespaceSensitivity": "ignore", + "printWidth": 80 } diff --git a/frontend/package.json b/frontend/package.json index 49956e3..119c603 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -11,9 +11,11 @@ "test": "jest", "test:watch": "jest --watch", "test:coverage": "jest --coverage", - "lint": "ng lint", - "prettier:fix": "npx prettier --write .", - "prettier:check": "npx prettier --check .", + "lint:check": "ng lint", + "lint:fix": "ng lint --fix", + "prettier:fix": "prettier --write .", + "prettier:check": "prettier --check .", + "format": "pnpm run lint:fix && pnpm run prettier:fix", "ngrok-tunnel": "pnpm wait-on http://localhost:4200 && ngrok http --domain=commonly-hot-airedale.ngrok-free.app 4200" }, "private": true, @@ -44,9 +46,10 @@ "@typescript-eslint/eslint-plugin": "6.19.0", "@typescript-eslint/parser": "6.19.0", "concurrently": "^8.2.2", - "eslint": "^8.56.0", + "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.29.1", + "eslint-plugin-prettier": "^5.1.3", "jest": "^29.7.0", "jest-preset-angular": "^14.0.3", "prettier": "3.2.5", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 8546aea..c6468ca 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -80,7 +80,7 @@ devDependencies: specifier: ^8.2.2 version: 8.2.2 eslint: - specifier: ^8.56.0 + specifier: ^8.57.0 version: 8.57.0 eslint-config-prettier: specifier: ^9.1.0 @@ -88,12 +88,15 @@ devDependencies: eslint-plugin-import: specifier: ^2.29.1 version: 2.29.1(@typescript-eslint/parser@6.19.0)(eslint@8.57.0) + eslint-plugin-prettier: + specifier: ^5.1.3 + version: 5.1.3(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5) jest: specifier: ^29.7.0 version: 29.7.0 jest-preset-angular: specifier: ^14.0.3 - version: 14.0.3(@angular-devkit/build-angular@17.3.0)(@angular/compiler-cli@17.3.0)(@angular/core@17.3.0)(@angular/platform-browser-dynamic@17.3.0)(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.4.2) + version: 14.0.3(@angular-devkit/build-angular@17.3.0)(@angular/compiler-cli@17.3.0)(@angular/core@17.3.0)(@angular/platform-browser-dynamic@17.3.0)(@babel/core@7.24.0)(jest@29.7.0)(typescript@5.4.2) prettier: specifier: 3.2.5 version: 3.2.5 @@ -2855,6 +2858,11 @@ packages: dev: true optional: true + /@pkgr/core@0.1.1: + resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==} + engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} + dev: true + /@rollup/rollup-android-arm-eabi@4.13.0: resolution: {integrity: sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==} cpu: [arm] @@ -5231,6 +5239,27 @@ packages: - supports-color dev: true + /eslint-plugin-prettier@5.1.3(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5): + resolution: {integrity: sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==} + engines: {node: ^14.18.0 || >=16.0.0} + peerDependencies: + '@types/eslint': '>=8.0.0' + eslint: '>=8.0.0' + eslint-config-prettier: '*' + prettier: '>=3.0.0' + peerDependenciesMeta: + '@types/eslint': + optional: true + eslint-config-prettier: + optional: true + dependencies: + eslint: 8.57.0 + eslint-config-prettier: 9.1.0(eslint@8.57.0) + prettier: 3.2.5 + prettier-linter-helpers: 1.0.0 + synckit: 0.8.8 + dev: true + /eslint-scope@5.1.1: resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==} engines: {node: '>=8.0.0'} @@ -5452,6 +5481,10 @@ packages: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} dev: true + /fast-diff@1.3.0: + resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==} + dev: true + /fast-glob@3.3.2: resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==} engines: {node: '>=8.6.0'} @@ -6731,7 +6764,7 @@ packages: jest-resolve: 29.7.0 dev: true - /jest-preset-angular@14.0.3(@angular-devkit/build-angular@17.3.0)(@angular/compiler-cli@17.3.0)(@angular/core@17.3.0)(@angular/platform-browser-dynamic@17.3.0)(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.4.2): + /jest-preset-angular@14.0.3(@angular-devkit/build-angular@17.3.0)(@angular/compiler-cli@17.3.0)(@angular/core@17.3.0)(@angular/platform-browser-dynamic@17.3.0)(@babel/core@7.24.0)(jest@29.7.0)(typescript@5.4.2): resolution: {integrity: sha512-usgBL7x0rXMnMSx8iEFeOozj50W6fp+YAmQcQBUdAXhN+PAXRy4UXL6I/rfcAOU09rnnq7RKsLsmhpp/fFEuag==} engines: {node: ^14.15.0 || >=16.10.0} peerDependencies: @@ -6752,7 +6785,7 @@ packages: jest-environment-jsdom: 29.7.0 jest-util: 29.7.0 pretty-format: 29.7.0 - ts-jest: 29.1.2(@babel/core@7.23.9)(esbuild@0.20.1)(jest@29.7.0)(typescript@5.4.2) + ts-jest: 29.1.2(@babel/core@7.24.0)(esbuild@0.20.1)(jest@29.7.0)(typescript@5.4.2) typescript: 5.4.2 optionalDependencies: esbuild: 0.20.1 @@ -8252,6 +8285,13 @@ packages: engines: {node: '>= 0.8.0'} dev: true + /prettier-linter-helpers@1.0.0: + resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==} + engines: {node: '>=6.0.0'} + dependencies: + fast-diff: 1.3.0 + dev: true + /prettier@3.2.5: resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} engines: {node: '>=14'} @@ -9211,6 +9251,14 @@ packages: resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} dev: true + /synckit@0.8.8: + resolution: {integrity: sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==} + engines: {node: ^14.18.0 || >=16.0.0} + dependencies: + '@pkgr/core': 0.1.1 + tslib: 2.6.2 + dev: true + /tapable@2.2.1: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} @@ -9362,7 +9410,7 @@ packages: typescript: 5.4.2 dev: true - /ts-jest@29.1.2(@babel/core@7.23.9)(esbuild@0.20.1)(jest@29.7.0)(typescript@5.4.2): + /ts-jest@29.1.2(@babel/core@7.24.0)(esbuild@0.20.1)(jest@29.7.0)(typescript@5.4.2): resolution: {integrity: sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==} engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0} hasBin: true @@ -9383,7 +9431,7 @@ packages: esbuild: optional: true dependencies: - '@babel/core': 7.23.9 + '@babel/core': 7.24.0 bs-logger: 0.2.6 esbuild: 0.20.1 fast-json-stable-stringify: 2.1.0 diff --git a/frontend/src/app/pages/register-root/register-root.component.ts b/frontend/src/app/pages/register-root/register-root.component.ts index 7aec8ec..d088974 100644 --- a/frontend/src/app/pages/register-root/register-root.component.ts +++ b/frontend/src/app/pages/register-root/register-root.component.ts @@ -177,12 +177,10 @@ export class RegisterRootComponent implements OnInit { } private signin(data: unknown): void { - console.log('Signin...'); console.log(data); } private register(data: unknown): void { - console.log('Register...'); console.log(data); } }