From 96b099b10ac58143d15b0ea28e1476a81d573c57 Mon Sep 17 00:00:00 2001
From: Sebastian Di Luzio <sebidiluzio@gmail.com>
Date: Fri, 10 Dec 2021 21:51:35 +0100
Subject: [PATCH] make tsconfig work for all ts apps

---
 .github/workflows/nodejs.yml                |  9 +++++++--
 apps.json                                   |  2 +-
 apps/widChargingStatus/{dist => }/widget.js | 15 ++++++++-------
 typescript/package.json                     |  2 +-
 typescript/tsconfig.json                    |  3 ++-
 5 files changed, 19 insertions(+), 12 deletions(-)
 rename apps/widChargingStatus/{dist => }/widget.js (61%)

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index e2a12cc51..8187fc890 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -16,7 +16,12 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
-      - name: npm i
-        run: npm i
+      - name: npm ci
+        working-directory: ./typescript
+        run: npm ci
       - name: build types
+        working-directory: ./typescript
+        run: npm run build:types
+      - name: build all TS apps
+        working-directory: ./typescript
         run: npm run build:types
diff --git a/apps.json b/apps.json
index 58a67d8c2..6e85c19d7 100644
--- a/apps.json
+++ b/apps.json
@@ -4763,7 +4763,7 @@
     "tags": "widget",
         "supports": ["BANGLEJS","BANGLEJS2"],
     "storage": [
-      {"name":"widChargingStatus.wid.js","url":"./dist/widget.js"}
+      {"name":"widChargingStatus.wid.js","url":"./widget.js"}
      ]
   },
   {
diff --git a/apps/widChargingStatus/dist/widget.js b/apps/widChargingStatus/widget.js
similarity index 61%
rename from apps/widChargingStatus/dist/widget.js
rename to apps/widChargingStatus/widget.js
index 6cac1931f..68a7c0aca 100644
--- a/apps/widChargingStatus/dist/widget.js
+++ b/apps/widChargingStatus/widget.js
@@ -1,22 +1,23 @@
-(function () {
-    var icon = require('heatshrink').decompress(atob('ikggMAiEAgYIBmEAg4EB+EAh0AgPggEeCAIEBnwQBAgP+gEP//x///j//8f//k///H//4BYOP/4lBv4bDvwEB4EAvAEBwEAuA7DCAI7BgAQBhEAA'));
-    var iconWidth = 18;
+"use strict";
+(() => {
+    const icon = require('heatshrink').decompress(atob('ikggMAiEAgYIBmEAg4EB+EAh0AgPggEeCAIEBnwQBAgP+gEP//x///j//8f//k///H//4BYOP/4lBv4bDvwEB4EAvAEBwEAuA7DCAI7BgAQBhEAA'));
+    const iconWidth = 18;
     function draw() {
         g.reset();
         if (Bangle.isCharging()) {
             g.setColor('#FD0');
             g.drawImage(icon, this.x + 1, this.y + 1, {
-                scale: 0.6875
+                scale: 0.6875,
             });
         }
     }
     WIDGETS.chargingStatus = {
         area: 'tr',
         width: Bangle.isCharging() ? iconWidth : 0,
-        draw: draw
+        draw,
     };
-    Bangle.on('charging', function (charging) {
-        var widget = WIDGETS.chargingStatus;
+    Bangle.on('charging', (charging) => {
+        const widget = WIDGETS.chargingStatus;
         if (widget) {
             if (charging) {
                 Bangle.buzz();
diff --git a/typescript/package.json b/typescript/package.json
index 83ea7d82b..4bfb88d27 100644
--- a/typescript/package.json
+++ b/typescript/package.json
@@ -7,7 +7,7 @@
     "typescript": "4.5.2"
   },
   "scripts": {
-    "build:example": "tsc ../apps/widChargingStatus/widget.ts --outDir ../apps/widChargingStatus/dist",
+    "build:apps": "tsc",
     "build:types": "tsc ./types/globals.d.ts"
   }
 }
diff --git a/typescript/tsconfig.json b/typescript/tsconfig.json
index 09101094b..aff7a6d38 100644
--- a/typescript/tsconfig.json
+++ b/typescript/tsconfig.json
@@ -13,5 +13,6 @@
     "noUnusedParameters": true,
     "strict": true
   },
-  "include": ["../apps/**/*", "./**/*"]
+  "include": ["../apps/**/*", "./**/*"],
+  "exclude": ["../apps/banglerun", "../apps/hebrew_calendar"]
 }