From 0d304122d5c2f19e2abb2b5c20ef9d8999c4a485 Mon Sep 17 00:00:00 2001
From: Eric Wollesen <eric@tidepool.org>
Date: Mon, 11 Dec 2023 15:15:54 -0700
Subject: [PATCH 1/2] bump exceljs to 4.4.0

Timeouts are occurring when exporting data. Seems that streaming might be
broken. Bumping to latest to see if we get lucky and that fixes the issue.
---
 package.json |  2 +-
 yarn.lock    | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index f06d92f3..d5c59bea 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "private": false,
   "dependencies": {
     "@godaddy/terminus": "4.12.1",
-    "@tidepool/data-tools": "2.4.1",
+    "@tidepool/data-tools": "https://github.com/tidepool-org/node-data-tools.git#eric/bump-exceljs-version",
     "@tidepool/viz": "1.37.0",
     "axios": "1.4.0",
     "blob-stream": "0.1.3",
diff --git a/yarn.lock b/yarn.lock
index 61e428b5..bed18443 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -416,16 +416,15 @@
   dependencies:
     tslib "^2.4.0"
 
-"@tidepool/data-tools@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@tidepool/data-tools/-/data-tools-2.4.1.tgz#ce0d6e4f8bebf80e5e3193a882b152c9069e3050"
-  integrity sha512-k5IxoeR3cLnmq6LoTGlG7Lhel6QQlxYWp0woqh9Dai8P9O7CKp6pTbArDvo2UHqNRoxl7Esvz020kw3i9rd9ow==
+"@tidepool/data-tools@https://github.com/tidepool-org/node-data-tools.git#eric/bump-exceljs-version":
+  version "2.4.2"
+  resolved "https://github.com/tidepool-org/node-data-tools.git#a0d115bb71b3772ca21ad2ec8ea7b16821c7a19c"
   dependencies:
     JSONStream "1.3.5"
     commander "4.1.1"
     csv-string "3.1.7"
     event-stream "3.3.4"
-    exceljs "4.3.0"
+    exceljs "4.4.0"
     flat "5.0.0"
     lodash "4.17.15"
     mkdirp "1.0.3"
@@ -2017,15 +2016,15 @@ event-stream@3.3.4:
     stream-combiner "~0.0.4"
     through "~2.3.1"
 
-exceljs@4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/exceljs/-/exceljs-4.3.0.tgz#939bc0d4c59c200acadb7051be34d25c109853c4"
-  integrity sha512-hTAeo5b5TPvf8Z02I2sKIT4kSfCnOO2bCxYX8ABqODCdAjppI3gI9VYiGCQQYVcBaBSKlFDMKlAQRqC+kV9O8w==
+exceljs@4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/exceljs/-/exceljs-4.4.0.tgz#cfb1cb8dcc82c760a9fc9faa9e52dadab66b0156"
+  integrity sha512-XctvKaEMaj1Ii9oDOqbW/6e1gXknSY4g/aLCDicOXqBE4M0nRWkUu0PTp++UPNzoFY12BNHMfs/VadKIS6llvg==
   dependencies:
     archiver "^5.0.0"
     dayjs "^1.8.34"
     fast-csv "^4.3.1"
-    jszip "^3.5.0"
+    jszip "^3.10.1"
     readable-stream "^3.6.0"
     saxes "^5.0.1"
     tmp "^0.2.0"
@@ -2892,7 +2891,7 @@ jsonparse@^1.2.0:
     object.assign "^4.1.4"
     object.values "^1.1.6"
 
-jszip@^3.5.0:
+jszip@^3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2"
   integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==

From 32c694f617f2e04fa1915ffca4601f3247326042 Mon Sep 17 00:00:00 2001
From: Eric Wollesen <eric@tidepool.org>
Date: Mon, 11 Dec 2023 15:54:41 -0700
Subject: [PATCH 2/2] install git in travis so that branch releases can be used

Trying to use an pre-release version of node-data-tools, but yarn apparently
expects it can shell out to git in order to pull the branch.
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2cb28b09..e749edcd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM node:16.20.1-alpine as base
 WORKDIR /app
 RUN apk --no-cache update && \
     apk --no-cache upgrade && \
-    apk add --no-cache --virtual .build-dependencies python3 make g++ && \
+    apk add --no-cache --virtual .build-dependencies python3 make g++ git && \
     mkdir -p node_modules && chown -R node:node .