From f8c64b45a73185806077ef7e43344f2f2c9829c2 Mon Sep 17 00:00:00 2001 From: mmcwilliams Date: Sat, 6 Jul 2019 19:53:03 -0400 Subject: [PATCH] Install sharp and animated-gif-detector --- app/package-lock.json | 70 ++++++++++++++++++++++++++++++++++++------- app/package.json | 2 ++ package-lock.json | 12 ++++++-- package.json | 3 +- src/globals.d.ts | 1 + 5 files changed, 73 insertions(+), 15 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index c8d8a9d..924e80d 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -203,6 +203,14 @@ } } }, + "animated-gif-detector": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/animated-gif-detector/-/animated-gif-detector-1.2.0.tgz", + "integrity": "sha1-yy+ZEcqAJPKzTGk7f9ZFQu5BYYk=", + "requires": { + "inherits": "^2.0.1" + } + }, "ansi-colors": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", @@ -2694,6 +2702,11 @@ "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" }, + "fs-copy-file-sync": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/fs-copy-file-sync/-/fs-copy-file-sync-1.1.1.tgz", + "integrity": "sha512-2QY5eeqVv4m2PfyMiEuy9adxNP+ajf+8AR05cEi+OAzPcOj90hvFImeZhTmKLBgSd9EvG33jsD7ZRxsx9dThkQ==" + }, "fs-extra": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz", @@ -2729,7 +2742,6 @@ "version": "1.2.6", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz", "integrity": "sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==", - "dev": true, "requires": { "minipass": "^2.2.1" } @@ -5127,7 +5139,6 @@ "version": "2.3.5", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", - "dev": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5136,8 +5147,7 @@ "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" } } }, @@ -5145,7 +5155,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", - "dev": true, "requires": { "minipass": "^2.2.1" } @@ -5394,9 +5403,7 @@ "nan": { "version": "2.14.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", - "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", - "dev": true, - "optional": true + "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==" }, "nanomatch": { "version": "1.2.13", @@ -6745,6 +6752,49 @@ "settings": { "version": "file:lib/settings" }, + "sharp": { + "version": "0.22.1", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.22.1.tgz", + "integrity": "sha512-lXzSk/FL5b/MpWrT1pQZneKe25stVjEbl6uhhJcTULm7PhmJgKKRbTDM/vtjyUuC/RLqL2PRyC4rpKwbv3soEw==", + "requires": { + "color": "^3.1.1", + "detect-libc": "^1.0.3", + "fs-copy-file-sync": "^1.1.1", + "nan": "^2.13.2", + "npmlog": "^4.1.2", + "prebuild-install": "^5.3.0", + "semver": "^6.0.0", + "simple-get": "^3.0.3", + "tar": "^4.4.8", + "tunnel-agent": "^0.6.0" + }, + "dependencies": { + "color": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz", + "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==", + "requires": { + "color-convert": "^1.9.1", + "color-string": "^1.5.2" + } + }, + "semver": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz", + "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==" + }, + "simple-get": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.0.3.tgz", + "integrity": "sha512-Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw==", + "requires": { + "decompress-response": "^3.3.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + } + } + } + }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", @@ -7254,7 +7304,6 @@ "version": "4.4.10", "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz", "integrity": "sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==", - "dev": true, "requires": { "chownr": "^1.1.1", "fs-minipass": "^1.2.5", @@ -7268,8 +7317,7 @@ "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" } } }, diff --git a/app/package.json b/app/package.json index f895c92..ff927f5 100644 --- a/app/package.json +++ b/app/package.json @@ -43,6 +43,7 @@ "typescript": "^3.5.2" }, "dependencies": { + "animated-gif-detector": "^1.2.0", "arduino": "file:lib/arduino", "cam": "file:lib/cam", "capture": "file:lib/capture", @@ -70,6 +71,7 @@ "serialport": "^7.1.5", "server": "file:lib/server", "settings": "file:lib/settings", + "sharp": "^0.22.1", "spawn": "file:lib/spawn", "system": "file:lib/system", "uuid": "^3.3.2", diff --git a/package-lock.json b/package-lock.json index 06f2db2..ff09ec5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,6 +61,15 @@ "@types/tough-cookie": "*" } }, + "@types/sharp": { + "version": "0.22.2", + "resolved": "https://registry.npmjs.org/@types/sharp/-/sharp-0.22.2.tgz", + "integrity": "sha512-oH49f42h3nf/qys0weYsaTGiMv67wPB769ynCoPfBAVwjjxFF3QtIPEe3MfhwyNjQAhQhTEfnmMKvVZfcFkhIw==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "@types/tough-cookie": { "version": "2.3.5", "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz", @@ -485,9 +494,6 @@ "devices": { "version": "file:lib/devices" }, - "digital": { - "version": "file:lib/digital" - }, "display": { "version": "file:lib/display" }, diff --git a/package.json b/package.json index 6d22711..af98a67 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "@types/fs-extra": "^7.0.0", "@types/node": "^12.0.8", "@types/request": "^2.48.1", + "@types/sharp": "^0.22.2", "@types/uuid": "^3.4.4", "jsdoc-to-markdown": "^5.0.0", "typescript": "^3.5.2" @@ -39,7 +40,7 @@ "cmd": "file:lib/cmd", "delay": "file:lib/delay", "devices": "file:lib/devices", - "digital": "file:lib/digital", + "filmout": "file:lib/filmout", "display": "file:lib/display", "light": "file:lib/light", "log": "file:lib/log", diff --git a/src/globals.d.ts b/src/globals.d.ts index 6fe5eff..4a24dea 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -9,6 +9,7 @@ declare module 'spawn'; declare module 'systeminformation'; declare module 'exit'; declare module 'request'; +declare module 'animated-gif-detector'; interface Device { arduino : string;