From 605f00cdf0d1df8e9280ced6e44c688012889bf0 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 24 Nov 2018 18:52:59 -0500 Subject: [PATCH] Readd necessary stuff, other cleanups --- .../ClientApp/src/registerServiceWorker.ts | 1 + src/Tgstation.Server.Host/ClientApp/tsconfig.prod.json | 3 +++ src/Tgstation.Server.Host/ClientApp/tslint.json | 6 +++++- src/Tgstation.Server.Host/Controllers/HomeController.cs | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 src/Tgstation.Server.Host/ClientApp/tsconfig.prod.json diff --git a/src/Tgstation.Server.Host/ClientApp/src/registerServiceWorker.ts b/src/Tgstation.Server.Host/ClientApp/src/registerServiceWorker.ts index 28c89f7b68..e10d7c6155 100644 --- a/src/Tgstation.Server.Host/ClientApp/src/registerServiceWorker.ts +++ b/src/Tgstation.Server.Host/ClientApp/src/registerServiceWorker.ts @@ -1,4 +1,5 @@ // tslint:disable:no-console +// tslint:disable:curly // In production, we register a service worker to serve assets from local cache. // This lets the app load faster on subsequent visits in production, and gives diff --git a/src/Tgstation.Server.Host/ClientApp/tsconfig.prod.json b/src/Tgstation.Server.Host/ClientApp/tsconfig.prod.json new file mode 100644 index 0000000000..fc8520e737 --- /dev/null +++ b/src/Tgstation.Server.Host/ClientApp/tsconfig.prod.json @@ -0,0 +1,3 @@ +{ + "extends": "./tsconfig.json" +} diff --git a/src/Tgstation.Server.Host/ClientApp/tslint.json b/src/Tgstation.Server.Host/ClientApp/tslint.json index bfdc862cf4..5ad33a8e73 100644 --- a/src/Tgstation.Server.Host/ClientApp/tslint.json +++ b/src/Tgstation.Server.Host/ClientApp/tslint.json @@ -1,10 +1,14 @@ { - "extends": ["tslint:recommended", "tslint-react", "tslint-config-prettier"], + "extends": [ "tslint:recommended", "tslint-react", "tslint-config-prettier" ], "linterOptions": { "exclude": [ "config/**/*.js", "node_modules/**/*.ts", "coverage/lcov-report/*.js" ] + }, + "rules": { + "curly": [ true, "as-needed" ], + "semicolon": [ true, "always" ] } } diff --git a/src/Tgstation.Server.Host/Controllers/HomeController.cs b/src/Tgstation.Server.Host/Controllers/HomeController.cs index 56d7a59e5a..755ad17ba0 100644 --- a/src/Tgstation.Server.Host/Controllers/HomeController.cs +++ b/src/Tgstation.Server.Host/Controllers/HomeController.cs @@ -85,7 +85,7 @@ namespace Tgstation.Server.Host.Controllers [TgsAuthorize] [AllowAnonymous] [HttpGet] - public IActionResult Home(CancellationToken cancellationToken) + public IActionResult Home() { if (AuthenticationContext != null) return Json(new Api.Models.ServerInformation