From 40d6b553325f518ee54dee6481a30698bfd9b348 Mon Sep 17 00:00:00 2001
From: hensm <m+github@matt.tf>
Date: Fri, 12 Apr 2019 07:19:00 +0100
Subject: [PATCH] Share tsconfig settings

---
 app/tsconfig.json                                    | 10 +---------
 app/tslint.json                                      |  2 +-
 common/tsconfig.json                                 | 11 +++++++++++
 tslintCommon.json => common/tslint.json              |  0
 .../ReceiverSelectorManager.ts                       |  2 +-
 .../NativeMacReceiverSelectorManager.ts              |  2 +-
 .../selectorManagers/PopupReceiverSelectorManager.ts |  2 +-
 ext/tsconfig.json                                    | 12 +++---------
 ext/tslint.json                                      |  2 +-
 9 files changed, 20 insertions(+), 23 deletions(-)
 create mode 100644 common/tsconfig.json
 rename tslintCommon.json => common/tslint.json (100%)

diff --git a/app/tsconfig.json b/app/tsconfig.json
index 82612d0..1ec6cdb 100644
--- a/app/tsconfig.json
+++ b/app/tsconfig.json
@@ -1,13 +1,5 @@
 {
-    "compilerOptions": {
-        "allowJs": true
-      , "target": "es5"
-      , "noImplicitAny": true
-      , "esModuleInterop": true
-      , "resolveJsonModule": true
-      , "removeComments": true
-      , "downlevelIteration": true
-    }
+    "extends": "../common/tsconfig"
   , "include": [
         "./src/**/*"
       , "./@types/**/*"
diff --git a/app/tslint.json b/app/tslint.json
index b138f8f..2df5ee8 100644
--- a/app/tslint.json
+++ b/app/tslint.json
@@ -1,5 +1,5 @@
 {
     "extends": [
-        "../tslintCommon.json"
+        "../common/tslint.json"
     ]
 }
diff --git a/common/tsconfig.json b/common/tsconfig.json
new file mode 100644
index 0000000..a90baae
--- /dev/null
+++ b/common/tsconfig.json
@@ -0,0 +1,11 @@
+{
+    "compilerOptions": {
+        "allowJs": true
+      , "esModuleInterop": true
+      , "module": "commonjs"
+      , "noImplicitAny": true
+      , "removeComments": true
+      , "resolveJsonModule": true
+      , "target": "es6"
+    }
+}
diff --git a/tslintCommon.json b/common/tslint.json
similarity index 100%
rename from tslintCommon.json
rename to common/tslint.json
diff --git a/ext/src/receiverSelectorManager/ReceiverSelectorManager.ts b/ext/src/receiverSelectorManager/ReceiverSelectorManager.ts
index f7d9ea5..53ea50b 100644
--- a/ext/src/receiverSelectorManager/ReceiverSelectorManager.ts
+++ b/ext/src/receiverSelectorManager/ReceiverSelectorManager.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import { Receiver } from "../types"
+import { Receiver } from "../types";
 
 
 export type ReceiverSelectorSelectedEvent = CustomEvent<Receiver>;
diff --git a/ext/src/receiverSelectorManager/selectorManagers/NativeMacReceiverSelectorManager.ts b/ext/src/receiverSelectorManager/selectorManagers/NativeMacReceiverSelectorManager.ts
index 8a632d7..5861a2f 100644
--- a/ext/src/receiverSelectorManager/selectorManagers/NativeMacReceiverSelectorManager.ts
+++ b/ext/src/receiverSelectorManager/selectorManagers/NativeMacReceiverSelectorManager.ts
@@ -3,7 +3,7 @@
 import ReceiverSelectorManager, {
         ReceiverSelectorCastType } from "../ReceiverSelectorManager";
 
-import { Receiver, Message } from "../../types";
+import { Message, Receiver } from "../../types";
 
 
 class NativeMacReceiverSelectorManager
diff --git a/ext/src/receiverSelectorManager/selectorManagers/PopupReceiverSelectorManager.ts b/ext/src/receiverSelectorManager/selectorManagers/PopupReceiverSelectorManager.ts
index c8d233d..8eafada 100644
--- a/ext/src/receiverSelectorManager/selectorManagers/PopupReceiverSelectorManager.ts
+++ b/ext/src/receiverSelectorManager/selectorManagers/PopupReceiverSelectorManager.ts
@@ -3,8 +3,8 @@
 import ReceiverSelectorManager, {
         ReceiverSelectorCastType } from "../ReceiverSelectorManager";
 
-import { Receiver, Message } from "../../types";
 import { getWindowCenteredProps } from "../../lib/utils";
+import { Message, Receiver } from "../../types";
 
 
 class PopupReceiverSelectorManager
diff --git a/ext/tsconfig.json b/ext/tsconfig.json
index 6d0edb4..143ccd5 100644
--- a/ext/tsconfig.json
+++ b/ext/tsconfig.json
@@ -1,15 +1,9 @@
 {
-    "compilerOptions": {
-        "allowJs": true
-      , "esModuleInterop": true
-      , "jsx": "react"
+    "extends": "../common/tsconfig"
+  , "compilerOptions": {
+        "jsx": "react"
       , "lib": [ "esnext", "dom" ]
-      , "module": "commonjs"
       , "moduleResolution": "node"
-      , "noImplicitAny": true
-      , "removeComments": true
-      , "resolveJsonModule": true
       , "sourceMap": true
-      , "target": "es6"
     }
 }
diff --git a/ext/tslint.json b/ext/tslint.json
index b138f8f..2df5ee8 100644
--- a/ext/tslint.json
+++ b/ext/tslint.json
@@ -1,5 +1,5 @@
 {
     "extends": [
-        "../tslintCommon.json"
+        "../common/tslint.json"
     ]
 }