Skip to content

Commit

Permalink
Merge pull request #1642 from tidepool-org/remove-lzo-decompress
Browse files Browse the repository at this point in the history
Remove unused lzo-decompress dependency (UPLOAD-1278)
  • Loading branch information
gniezen authored Jul 25, 2024
2 parents f5b717d + 2805c9c commit 3a12702
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 24 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ Tidepool Uploader makes use of the following LGPL-licensed libraries:
These libraries are used in the following Node.js modules created by Tidepool and are dependencies of the Tidepool Uploader:

- https://github.com/tidepool-org/node-mtp (libmtp)
- https://github.com/tidepool-org/lzo-decompress (libavutil)
- https://github.com/tidepool-org/lzo-wasm (libavutil)

The LGPL is intended to allow use of libraries in applications that don’t necessarily distribute the source of the application. The LGPL has two requirements:

Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tidepool-uploader",
"productName": "tidepool-uploader",
"version": "2.58.0",
"version": "2.58.0-remove-lzo-decompress.1",
"description": "Tidepool Project Universal Uploader",
"main": "./main.prod.js",
"author": {
Expand Down
4 changes: 2 additions & 2 deletions lib/drivers/medtronic600/medtronic600Driver.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ const isBrowser = typeof window !== 'undefined';
// eslint-disable-next-line no-console
const debug = isBrowser ? require('bows')('Medtronic600Driver') : console.log;

// lzo-wasm only works in the browser, for cli we use lzo-decompress
// only load lzo-wasm in the browser/electron, we don't need it for cli
// eslint-disable-next-line import/no-extraneous-dependencies
const LZO = isBrowser ? require('lzo-wasm') : require('lzo-decompress');
const LZO = isBrowser ? require('lzo-wasm') : null;

class TimeoutError extends ExtendableError {}

Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tidepool-uploader",
"version": "2.58.0",
"version": "2.58.0-remove-lzo-decompress.1",
"description": "Tidepool Project Universal Uploader",
"private": true,
"main": "main.prod.js",
Expand Down Expand Up @@ -172,7 +172,6 @@
"jest": "26.6.3",
"json-loader": "0.5.7",
"less-loader": "6.2.0",
"lzo-decompress": "1.0.1",
"mini-css-extract-plugin": "0.12.0",
"moment": "2.29.4",
"object-invariant-test-helper": "0.1.1",
Expand Down
18 changes: 0 additions & 18 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10183,14 +10183,6 @@ lzma-native@^8.0.5:
node-gyp-build "^4.2.1"
readable-stream "^3.6.0"

[email protected]:
version "1.0.1"
resolved "https://registry.yarnpkg.com/lzo-decompress/-/lzo-decompress-1.0.1.tgz#fe8649ba73fe20a4ebafd2f119ad7c1db57949dd"
integrity sha512-C9GZmL2MwkxIFw6EuwvA82WUTxWwMN/yPToMKOpqmg72Yq9+V2qQFwukaacvXyd5ICv5i1EiVfYvHmx6ObfNeA==
dependencies:
napi-macros "2.0.0"
node-gyp-build "4.2.0"

[email protected]:
version "0.0.4"
resolved "https://registry.yarnpkg.com/lzo-wasm/-/lzo-wasm-0.0.4.tgz#49152521a0b67a1da3a3e113dd38f150f303230a"
Expand Down Expand Up @@ -10678,11 +10670,6 @@ napi-build-utils@^1.0.1:
resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==

[email protected]:
version "2.0.0"
resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b"
integrity sha512-A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg==

native-request@^1.0.5:
version "1.1.0"
resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.1.0.tgz#acdb30fe2eefa3e1bc8c54b3a6852e9c5c0d3cb0"
Expand Down Expand Up @@ -10790,11 +10777,6 @@ node-forge@^0.10.0:
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==

[email protected]:
version "4.2.0"
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.0.tgz#2c2b05f461f4178641a6ce2d7159f04094e9376d"
integrity sha512-4oiumOLhCDU9Rronz8PZ5S4IvT39H5+JEv/hps9V8s7RSLhsac0TCP78ulnHXOo8X1wdpPiTayGlM1jr4IbnaQ==

node-gyp-build@^4.2.1, node-gyp-build@^4.3.0:
version "4.8.0"
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.0.tgz#3fee9c1731df4581a3f9ead74664369ff00d26dd"
Expand Down

0 comments on commit 3a12702

Please sign in to comment.