From dfecb9003600913f8c3130a87e5b403d6686a55f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 8 Mar 2018 17:31:11 +0100 Subject: [PATCH] Fix lint momory issues --- client/tslint.json | 2 +- scripts/travis.sh | 2 +- shared/models/activitypub/activitypub-ordered-collection.ts | 2 -- shared/models/users/user-login.model.ts | 2 +- tslint.json | 1 + 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/client/tslint.json b/client/tslint.json index c1ca4336e..db852d9f8 100644 --- a/client/tslint.json +++ b/client/tslint.json @@ -6,7 +6,7 @@ "eofline": true, "max-line-length": [true, 140], "no-floating-promises": false, - "no-unused-variable": false, // Bug, wait TypeScript 2.4 + "no-unused-variable": false, // Memory issues "member-ordering": [true, "public-before-private", "static-before-instance", diff --git a/scripts/travis.sh b/scripts/travis.sh index a3e065d47..ea0dc8699 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -25,5 +25,5 @@ elif [ "$1" = "lint" ]; then npm run lint || exit -1 cd .. || exit -1 - npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" || exit -1 + npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts" || exit -1 fi diff --git a/shared/models/activitypub/activitypub-ordered-collection.ts b/shared/models/activitypub/activitypub-ordered-collection.ts index 487d8cee0..dfec0bb76 100644 --- a/shared/models/activitypub/activitypub-ordered-collection.ts +++ b/shared/models/activitypub/activitypub-ordered-collection.ts @@ -1,5 +1,3 @@ -import { Activity } from './activity' - export interface ActivityPubOrderedCollection { '@context': string[] type: 'OrderedCollection' | 'OrderedCollectionPage' diff --git a/shared/models/users/user-login.model.ts b/shared/models/users/user-login.model.ts index b0383c695..1e85ab30b 100644 --- a/shared/models/users/user-login.model.ts +++ b/shared/models/users/user-login.model.ts @@ -2,4 +2,4 @@ export interface UserLogin { access_token: string refresh_token: string token_type: string -} \ No newline at end of file +} diff --git a/tslint.json b/tslint.json index 9acb24630..92d0bd2b1 100644 --- a/tslint.json +++ b/tslint.json @@ -7,6 +7,7 @@ "indent": ["spaces"], "ter-indent": [true, 2], "max-line-length": [true, 140], + "no-unused-variable": false, // Memory issues "no-floating-promises": false } }