Merge pull request #1666 from tidepool-org/deps-update

Dependency updates (UPLOAD-1330)

.circleci/config.yml

@@ -28,10 +28,10 @@ jobs:
           export NVM_DIR="$HOME/.nvm"
           [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
           [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
-          nvm install v18.17.1
-          nvm alias default v18.17.1
+          nvm install v20.14.0
+          nvm alias default v20.14.0
     - run: node -v
-    - run: npm install --global npm node-gyp
+    - run: npm install --global node-gyp
     - run: echo $SHELL
     - run: npm -v
     - run: node-gyp -v
@@ -111,7 +111,7 @@ jobs:
       BASH_ENV: ".circleci/bash_env.sh"
       DISPLAY: ":99"
     docker:
-      - image: cimg/node:18.17.1-browsers
+      - image: cimg/node:20.14.0-browsers
     steps:
       - setup_remote_docker:
           version: docker23
@@ -152,8 +152,8 @@ jobs:
           key: dependency-cache-{{ checksum "package.json" }}
       - run: python -m pip install packaging
       - run: pip install setuptools
-      - run: nvm install v18.17.1
-      - run: nvm use v18.17.1
+      - run: nvm install v20.14.0
+      - run: nvm use v20.14.0
       - run: node -v
       - run: npm install --global npm@8 node-gyp
       - run: npm -v

.nvmrc

@@ -1 +1 @@
-18.17.1
+20.14.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.17.1-alpine as base
+FROM node:20.14.0-alpine as base
 WORKDIR /app
 RUN mkdir -p dist node_modules .yarn-cache && chown -R node:node .
 

README.md

@@ -184,13 +184,10 @@ apm install editorconfig es6-javascript javascript-snippets linter linter-eslint
 - Linux: <kbd>Ctrl</kbd> <kbd>Shift</kbd> <kbd>I</kbd> or <kbd>F12</kbd>
 - Windows: <kbd>Ctrl</kbd> <kbd>Shift</kbd> <kbd>I</kbd> or <kbd>F12</kbd>
 
-*See [electron-debug](https://github.com/sindresorhus/electron-debug) for more information.*
-
 #### DevTools extension
 
 This project includes the following DevTools extensions:
 
-* [Devtron](https://github.com/electron/devtron) - Install via [electron-debug](https://github.com/sindresorhus/electron-debug).
 * [React Developer Tools](https://github.com/facebook/react-devtools) - Install via [electron-devtools-installer](https://github.com/GPMDP/electron-devtools-installer).
 * [Redux DevTools](https://github.com/zalmoxisus/redux-devtools-extension) - Install via [electron-devtools-installer](https://github.com/GPMDP/electron-devtools-installer).
 

app/main.dev.js

@@ -71,7 +71,6 @@ if (process.env.NODE_ENV === 'production') {
 }
 
 if (process.env.NODE_ENV === 'development') {
-  require('electron-debug')(); // eslint-disable-line global-require
   const p = path.join(__dirname, '..', 'app', 'node_modules'); // eslint-disable-line
   require('module').globalPaths.push(p); // eslint-disable-line
   process.env.APPIMAGE = path.join(__dirname, 'release');
@@ -157,6 +156,7 @@ function createWindow() {
     },
     acceptFirstMouse: true,
   });
+  mainWindow.setContentSize(663, 741); // newer electron versions break layout on Windows if this is not set
 
   protocol.handle(PROTOCOL_PREFIX, (request) => {
     return handleIncomingUrl(request.url);

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tidepool-uploader",
   "productName": "tidepool-uploader",
-  "version": "2.60.0-selection-naming.1",
+  "version": "2.60.0-deps-update.8",
   "description": "Tidepool Project Universal Uploader",
   "main": "./main.prod.js",
   "author": {

app/yarn.lock

@@ -54,11 +54,11 @@ chownr@^1.1.1:
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
 debug@^4.3.4:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
-  integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
+  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
   dependencies:
-    ms "2.1.2"
+    ms "^2.1.3"
 
 decompress-response@^6.0.0:
   version "6.0.0"
@@ -152,20 +152,20 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+ms@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 napi-build-utils@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
   integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
 
 node-abi@^3.3.0:
-  version "3.65.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.65.0.tgz#ca92d559388e1e9cab1680a18c1a18757cdac9d3"
-  integrity sha512-ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA==
+  version "3.71.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.71.0.tgz#52d84bbcd8575efb71468fbaa1f9a49b2c242038"
+  integrity sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==
   dependencies:
     semver "^7.3.5"
 
@@ -175,14 +175,14 @@ node-addon-api@^4.3.0:
   integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==
 
 node-addon-api@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-8.1.0.tgz#55a573685dd4bd053f189cffa4e6332d2b1f1645"
-  integrity sha512-yBY+qqWSv3dWKGODD6OGE6GnTX7Q2r+4+DfpqxHSHh8x0B4EKP9+wVGLS6U/AM1vxSNNmUEuIV5EGhYwPpfOwQ==
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-8.2.2.tgz#3658f78d04d260aa95931d3bbc45f22ce433b821"
+  integrity sha512-9emqXAKhVoNrQ792nLI/wpzPpJ/bj/YXxW0CvAau1+RdGBcCRF1Dmz7719zgVsQNrzHl9Tzn3ImZ4qWFarWL0A==
 
 node-gyp-build@^4.5.0:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.1.tgz#976d3ad905e71b76086f4f0b0d3637fe79b6cda5"
-  integrity sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==
+  version "4.8.4"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.4.tgz#8a70ee85464ae52327772a90d66c6077a900cfc8"
+  integrity sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==
 
 once@^1.3.1, once@^1.4.0:
   version "1.4.0"
@@ -210,9 +210,9 @@ prebuild-install@^7.0.1, prebuild-install@^7.1.1:
     tunnel-agent "^0.6.0"
 
 pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.2.tgz#836f3edd6bc2ee599256c924ffe0d88573ddcbf8"
+  integrity sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"

lib/core/driverManifests.js

@@ -22,8 +22,8 @@ const driverManifests = {
   Dexcom: {
     mode: 'serial',
     usb: [
-      { vendorId: 8867, productId: 71, driver: 'cdc-acm' }, // G4, G5 and G6
-      { vendorId: 8867, productId: 72, driver: 'cdc-acm' }, // G7, not supported yet
+      { vendorId: 8867, productId: 71 }, // G4, G5 and G6
+      { vendorId: 8867, productId: 72 }, // G7, not supported yet
     ],
   },
   AbbottPrecisionXtra: {
@@ -39,7 +39,7 @@ const driverManifests = {
     sendTimeout: 50,
     receiveTimeout: 50,
     usb: [
-      { vendorId: 1155, productId: 22336, driver: 'cdc-acm' },
+      { vendorId: 1155, productId: 22336 },
     ],
   },
   AbbottFreeStyleLite: {

lib/serialDevice.js

@@ -17,15 +17,13 @@
 var _ = require('lodash');
 var async = require('async');
 
-var UsbCdcAcm = null;
 var PL2303 = null;
 var CP2102 = null;
 var FTDI = null;
 if (!(process.env.NODE_ENV === 'test')) {
   // libusb is not available when testing on CI environments
 
   (async () => {
-    UsbCdcAcm = await import('usb-cdc-acm');
     PL2303 = (await import('pl2303')).default;
     CP2102 = (await import('cp2102')).default;
     FTDI = (await import('ftdi-js')).default;
@@ -225,13 +223,6 @@ module.exports = function(config) {
               return cb();
             });
             break;
-          case 'cdc-acm':
-            var device = deviceInfo.usbDevice;
-            device.open();
-            connection = UsbCdcAcm.fromUsbDevice(device, connectopts);
-            connection.cdcAcm = device;
-            return cb();
-            break;
           case 'cp2102':
             connection = new CP2102(deviceInfo.usbDevice, connectopts);
             connection.addEventListener('error', function (event) {
@@ -304,11 +295,6 @@ module.exports = function(config) {
 
   function disconnect(cb) {
     if (connection) {
-      if (connection.cdcAcm) {
-        connection.destroy();
-        init();
-        return cb();
-      }
       if (reader) {
         (async () => {
           keepReading = false;

locales/en/translation.missing.json

@@ -72,5 +72,11 @@
   "There is no new data since last time. If you think this is an error, please reach out below.": "There is no new data since last time. If you think this is an error, please reach out below.",
   "Data is up to date": "Data is up to date",
   "There is no data on the device. If you think this is an error, please reach out below.": "There is no data on the device. If you think this is an error, please reach out below.",
-  "Unlock PDM. Plug into USB. Tap Export on PDM. Click Upload.": "Unlock PDM. Plug into USB. Tap Export on PDM. Click Upload."
+  "Unlock PDM. Plug into USB. Tap Export on PDM. Click Upload.": "Unlock PDM. Plug into USB. Tap Export on PDM. Click Upload.",
+  "Clinic Workspace": "Clinic Workspace",
+  "To manage your clinic workspaces and view patient invites": "To manage your clinic workspaces and view patient invites",
+  "login to your account in Tidepool Web": "login to your account in Tidepool Web",
+  "Go to Workspace": "Go to Workspace",
+  "Want to use Tidepool for your private data?": "Want to use Tidepool for your private data?",
+  "Go to Private Workspace": "Go to Private Workspace"
 }