From f01815bd04c6b9ed01d8f9fdd67d2ffc3d08d512 Mon Sep 17 00:00:00 2001 From: ShahanaFarooqui Date: Mon, 10 Jun 2024 13:54:52 -0700 Subject: [PATCH] Circle CI build and lint fixes (#1407) --- .eslintrc.json | 8 +++++--- dockerfiles/Dockerfile | 2 +- dockerfiles/Dockerfile.arm32v7 | 2 +- dockerfiles/Dockerfile.arm64v8 | 2 +- .../channel-open-table/channel-open-table.component.ts | 1 - src/app/shared/shared.module.ts | 6 ------ 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 16496feb..84cb01fc 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -23,13 +23,14 @@ "plugin:@angular-eslint/template/process-inline-templates" ], "rules": { - "deprecation/deprecation": "error", + "@angular-eslint/consistent-component-styles": "off", "@angular-eslint/prefer-on-push-component-change-detection": "off", + "@angular-eslint/prefer-standalone": "off", "@angular-eslint/prefer-standalone-component": "off", "@angular-eslint/sort-ngmodule-metadata-arrays": "off", "@angular-eslint/use-component-view-encapsulation": "off", "@angular-eslint/use-injectable-provided-in": "off", - "@typescript-eslint/member-delimiter-style": "off", + "@typescript-eslint/member-delimiter-style": "off", "@typescript-eslint/no-non-null-assertion": "off", "@typescript-eslint/type-annotation-spacing": 0, "quotes": ["error", "single"], @@ -181,7 +182,7 @@ "files": [ "*.html" ], -"parser": "@angular-eslint/template-parser", + "parser": "@angular-eslint/template-parser", "extends": [ "plugin:@angular-eslint/template/all", "plugin:@angular-eslint/template/recommended", @@ -206,6 +207,7 @@ "@angular-eslint/template/no-positive-tabindex": "off", "@angular-eslint/template/prefer-ngsrc": "off", "@angular-eslint/template/prefer-control-flow": "off", + "@angular-eslint/template/prefer-self-closing-tags": "off", "@angular-eslint/template/use-track-by-function": "off" } } diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 0f2e11d8..d84ae9af 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -22,7 +22,7 @@ RUN npm run buildfrontend RUN npm run buildbackend # Remove non production necessary modules -RUN npm prune --production +RUN npm prune --omit=dev --legacy-peer-deps # --------------- # Release App diff --git a/dockerfiles/Dockerfile.arm32v7 b/dockerfiles/Dockerfile.arm32v7 index b3841c55..8ec8d167 100644 --- a/dockerfiles/Dockerfile.arm32v7 +++ b/dockerfiles/Dockerfile.arm32v7 @@ -26,7 +26,7 @@ RUN npm run buildfrontend RUN npm run buildbackend # Remove non production necessary modules -RUN npm prune --production +RUN npm prune --omit=dev --legacy-peer-deps # --------------- # Release App diff --git a/dockerfiles/Dockerfile.arm64v8 b/dockerfiles/Dockerfile.arm64v8 index 9d977df3..6b003a12 100644 --- a/dockerfiles/Dockerfile.arm64v8 +++ b/dockerfiles/Dockerfile.arm64v8 @@ -25,7 +25,7 @@ RUN npm run buildfrontend RUN npm run buildbackend # Remove non production necessary modules -RUN npm prune --production +RUN npm prune --omit=dev --legacy-peer-deps # --------------- # Release App diff --git a/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts b/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts index a1775037..6d5f860b 100644 --- a/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts +++ b/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts @@ -119,7 +119,6 @@ export class CLNChannelOpenTableComponent implements OnInit, AfterViewInit, OnDe subscribe((nodeSettings) => { this.selNode = nodeSettings; }); - } ngAfterViewInit() { diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 3196dc8b..35750e58 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -245,10 +245,8 @@ export const DEFAULT_DATE_FORMAT: MatDateFormats = { TopMenuComponent, LoginComponent, HelpComponent, - SettingsComponent, BitcoinConfigComponent, AuthSettingsComponent, - AppSettingsComponent, NodeConfigComponent, LNPConfigComponent, NodeSettingsComponent, @@ -286,10 +284,8 @@ export const DEFAULT_DATE_FORMAT: MatDateFormats = { TopMenuComponent, LoginComponent, HelpComponent, - SettingsComponent, BitcoinConfigComponent, AuthSettingsComponent, - AppSettingsComponent, NodeConfigComponent, LNPConfigComponent, NodeSettingsComponent, @@ -313,7 +309,6 @@ export const DEFAULT_DATE_FORMAT: MatDateFormats = { CamelCasePipe, CamelCaseWithReplacePipe, CamelCaseWithSpacesPipe, - AuthSettingsComponent, TransactionsReportTableComponent, OnChainGeneratedAddressComponent, ShowPubkeyComponent, @@ -324,7 +319,6 @@ export const DEFAULT_DATE_FORMAT: MatDateFormats = { IsAuthorizedComponent, TwoFactorAuthComponent, LoginTokenComponent, - TransactionsReportTableComponent, LNServicesComponent, LoopComponent, SwapsComponent,