From c15f71071e72ae39cceeede579e00c05e9f60aa7 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Wed, 18 Dec 2019 17:56:58 +1000
Subject: [PATCH] fix broken js building

- deps need to be defined before used
- incremental builds were not working properly
---
 Makefile         | 12 ++++++------
 ts/tsconfig.json |  2 --
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 89491c8d8..904a5b418 100644
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,12 @@ REQS := .build/pyrunreqs .build/pydevreqs .build/jsreqs
 	(cd ts && npm i)
 	touch $@
 
+# Typescript source
+######################
+
+TSDEPS := $(wildcard ts/src/*.ts)
+JSDEPS := $(patsubst ts/src/%.ts, web/%.js, $(TSDEPS))
+
 # Building
 ######################
 
@@ -128,12 +134,6 @@ pytest: .build/pytest
 pylint: .build/pylint
 pytype: .build/pytype
 
-# Typescript source
-######################
-
-TSDEPS := $(wildcard ts/src/*.ts)
-JSDEPS := $(patsubst ts/src/%.ts, web/%.js, $(TSDEPS))
-
 # Checking typescript
 ######################
 
diff --git a/ts/tsconfig.json b/ts/tsconfig.json
index 9a00499e8..76f62f120 100644
--- a/ts/tsconfig.json
+++ b/ts/tsconfig.json
@@ -8,8 +8,6 @@
     ],
     "rootDir": "src",
     "outDir": "../web",
-    "incremental": true,
-    "tsBuildInfoFile": "./.buildinfo",
     "strict": true,
     /* Enable all strict type-checking options. */
     "noImplicitAny": false,