From ed90f21188ad1a67bd645045b5425b45012e4290 Mon Sep 17 00:00:00 2001
From: Alexis Svinartchouk <alexis@balena.io>
Date: Thu, 13 Feb 2020 11:14:46 +0100
Subject: [PATCH] Running `make lint` will now fix the typescript files

Change-type: patch
---
 Makefile     | 4 ++--
 package.json | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 595c5316..15091162 100644
--- a/Makefile
+++ b/Makefile
@@ -124,7 +124,7 @@ TARGETS = \
 	help \
 	info \
 	lint \
-	lint-js \
+	lint-ts \
 	lint-sass \
 	lint-cpp \
 	lint-spell \
@@ -149,7 +149,7 @@ sass:
 	node-sass lib/gui/app/scss/main.scss > lib/gui/css/main.css
 
 lint-ts:
-	resin-lint --typescript typings lib tests scripts/clean-shrinkwrap.ts webpack.config.ts
+	resin-lint --fix --typescript typings lib tests scripts/clean-shrinkwrap.ts webpack.config.ts
 
 lint-sass:
 	sass-lint lib/gui/scss
diff --git a/package.json b/package.json
index 70333b7c..9a50bbcf 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,6 @@
   },
   "scripts": {
     "test": "make lint test sanity-checks",
-    "prettier": "prettier --config ./node_modules/resin-lint/config/.prettierrc --write \"lib/**/*.ts\" \"lib/**/*.tsx\" \"tests/**/*.ts\" \"webpack.config.ts\" \"scripts/clean-shrinkwrap.ts\"",
     "start": "./node_modules/.bin/electron .",
     "postshrinkwrap": "ts-node ./scripts/clean-shrinkwrap.ts",
     "configure": "node-gyp configure",
@@ -39,7 +38,6 @@
   },
   "lint-staged": {
     "./**/*.{ts,tsx}": [
-      "npm run prettier",
       "make lint-ts",
       "git add"
     ]