diff --git a/package-lock.json b/package-lock.json index 776c554..2a409f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,6 @@ "@types/bluebird": "^3.5.36", "@types/engine-check": "^1.1.1", "@types/stream-to-promise": "^2.2.1", - "@types/usb": "^1.5.4", "@types/yargs": "^17.0.10", "eslint-config-joelpurra": "github:joelpurra/eslint-config-joelpurra#semver:^v11.0.1", "husky": "^4.3.8", @@ -309,14 +308,10 @@ "@types/node": "*" } }, - "node_modules/@types/usb": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/@types/usb/-/usb-1.5.4.tgz", - "integrity": "sha512-NOUza/8yuswu6RoECQyPHEjA34qpDaeONQ72fm+bCnnN2DJjDePAY+NsmV17H88oIlq4JlJ2mD5Kh5d6R2MwTQ==", - "dev": true, - "dependencies": { - "@types/node": "*" - } + "node_modules/@types/w3c-web-usb": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/w3c-web-usb/-/w3c-web-usb-1.0.6.tgz", + "integrity": "sha512-cSjhgrr8g4KbPnnijAr/KJDNKa/bBa+ixYkywFRvrhvi9n1WEl7yYbtRyzE6jqNQiSxxJxoAW3STaOQwJHndaw==" }, "node_modules/@types/yargs": { "version": "17.0.10", @@ -2151,27 +2146,6 @@ "semver": "bin/semver.js" } }, - "node_modules/eslint-plugin-prettier": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz", - "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==", - "dev": true, - "dependencies": { - "prettier-linter-helpers": "^1.0.0" - }, - "engines": { - "node": ">=6.0.0" - }, - "peerDependencies": { - "eslint": ">=7.28.0", - "prettier": ">=2.0.0" - }, - "peerDependenciesMeta": { - "eslint-config-prettier": { - "optional": true - } - } - }, "node_modules/eslint-plugin-promise": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.0.0.tgz", @@ -5810,28 +5784,29 @@ "punycode": "^2.1.0" } }, - "node_modules/usb": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/usb/-/usb-1.9.2.tgz", - "integrity": "sha512-dryNz030LWBPAf6gj8vyq0Iev3vPbCLHCT8dBw3gQRXRzVNsIdeuU+VjPp3ksmSPkeMAl1k+kQ14Ij0QHyeiAg==", - "hasInstallScript": true, + "node_modules/uvc-control": { + "version": "2.0.0", + "resolved": "git+ssh://git@github.com/joelpurra/node-uvc-control.git#267b0dbe77636e15e69cfb8f3de310641fac72b5", + "license": "ISC", "dependencies": { - "node-addon-api": "^4.2.0", - "node-gyp-build": "^4.3.0" + "usb": "^2.4.1" }, "engines": { - "node": ">=10.16.0" + "node": ">=12" } }, - "node_modules/uvc-control": { - "version": "2.0.0", - "resolved": "git+ssh://git@github.com/joelpurra/node-uvc-control.git#df09109c5cbbe5886a867b95aaa002a1a05e3830", - "license": "ISC", + "node_modules/uvc-control/node_modules/usb": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/usb/-/usb-2.4.1.tgz", + "integrity": "sha512-eXrbWIWG09ReeXCoHXI8dfOa72z7f6n9yGu2GLeiBnd990M6GJUwjWIqjquzlSr3bnqlXM86Ce8VHCoLcCVfKg==", + "hasInstallScript": true, "dependencies": { - "usb": "^1.9.2" + "@types/w3c-web-usb": "1.0.6", + "node-addon-api": "^4.2.0", + "node-gyp-build": "^4.3.0" }, "engines": { - "node": ">=12" + "node": ">=10.20.0 <11.x || >=12.17.0 <13.0 || >=14.0.0" } }, "node_modules/v8-compile-cache": { @@ -6437,6 +6412,27 @@ "typescript": ">=4.4" } }, + "node_modules/xo/node_modules/eslint-plugin-prettier": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz", + "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==", + "dev": true, + "dependencies": { + "prettier-linter-helpers": "^1.0.0" + }, + "engines": { + "node": ">=6.0.0" + }, + "peerDependencies": { + "eslint": ">=7.28.0", + "prettier": ">=2.0.0" + }, + "peerDependenciesMeta": { + "eslint-config-prettier": { + "optional": true + } + } + }, "node_modules/xo/node_modules/eslint-scope": { "version": "5.1.1", "dev": true, @@ -7101,14 +7097,10 @@ "@types/node": "*" } }, - "@types/usb": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/@types/usb/-/usb-1.5.4.tgz", - "integrity": "sha512-NOUza/8yuswu6RoECQyPHEjA34qpDaeONQ72fm+bCnnN2DJjDePAY+NsmV17H88oIlq4JlJ2mD5Kh5d6R2MwTQ==", - "dev": true, - "requires": { - "@types/node": "*" - } + "@types/w3c-web-usb": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/w3c-web-usb/-/w3c-web-usb-1.0.6.tgz", + "integrity": "sha512-cSjhgrr8g4KbPnnijAr/KJDNKa/bBa+ixYkywFRvrhvi9n1WEl7yYbtRyzE6jqNQiSxxJxoAW3STaOQwJHndaw==" }, "@types/yargs": { "version": "17.0.10", @@ -8480,15 +8472,6 @@ } } }, - "eslint-plugin-prettier": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz", - "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==", - "dev": true, - "requires": { - "prettier-linter-helpers": "^1.0.0" - } - }, "eslint-plugin-promise": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.0.0.tgz", @@ -11052,20 +11035,23 @@ "punycode": "^2.1.0" } }, - "usb": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/usb/-/usb-1.9.2.tgz", - "integrity": "sha512-dryNz030LWBPAf6gj8vyq0Iev3vPbCLHCT8dBw3gQRXRzVNsIdeuU+VjPp3ksmSPkeMAl1k+kQ14Ij0QHyeiAg==", - "requires": { - "node-addon-api": "^4.2.0", - "node-gyp-build": "^4.3.0" - } - }, "uvc-control": { - "version": "git+ssh://git@github.com/joelpurra/node-uvc-control.git#df09109c5cbbe5886a867b95aaa002a1a05e3830", + "version": "git+ssh://git@github.com/joelpurra/node-uvc-control.git#267b0dbe77636e15e69cfb8f3de310641fac72b5", "from": "uvc-control@github:joelpurra/node-uvc-control#v2", "requires": { - "usb": "^1.9.2" + "usb": "^2.4.1" + }, + "dependencies": { + "usb": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/usb/-/usb-2.4.1.tgz", + "integrity": "sha512-eXrbWIWG09ReeXCoHXI8dfOa72z7f6n9yGu2GLeiBnd990M6GJUwjWIqjquzlSr3bnqlXM86Ce8VHCoLcCVfKg==", + "requires": { + "@types/w3c-web-usb": "1.0.6", + "node-addon-api": "^4.2.0", + "node-gyp-build": "^4.3.0" + } + } } }, "v8-compile-cache": { @@ -11455,6 +11441,15 @@ "dev": true, "requires": {} }, + "eslint-plugin-prettier": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz", + "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==", + "dev": true, + "requires": { + "prettier-linter-helpers": "^1.0.0" + } + }, "eslint-scope": { "version": "5.1.1", "bundled": true, diff --git a/package.json b/package.json index 7a091ae..6de7a92 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,6 @@ "@types/bluebird": "^3.5.36", "@types/engine-check": "^1.1.1", "@types/stream-to-promise": "^2.2.1", - "@types/usb": "^1.5.4", "@types/yargs": "^17.0.10", "eslint-config-joelpurra": "github:joelpurra/eslint-config-joelpurra#semver:^v11.0.1", "husky": "^4.3.8", diff --git a/src/types/uvc-control.d.ts b/src/types/uvc-control.d.ts index d378824..1a81b0f 100644 --- a/src/types/uvc-control.d.ts +++ b/src/types/uvc-control.d.ts @@ -23,8 +23,9 @@ declare module "uvc-control" { ReadonlyDeep, } from "type-fest"; - // eslint-disable-next-line import/no-extraneous-dependencies - import usb from "usb"; + import { + usb, + } from "usb"; /* eslint-disable @typescript-eslint/member-ordering */ export default class Camera {