diff --git a/binding.gyp b/binding.gyp index 4209a5de..048a5746 100644 --- a/binding.gyp +++ b/binding.gyp @@ -17,8 +17,18 @@ "libraries": [ "-lShell32.lib", ], - } ] + } ], + [ 'OS=="mac"', { + "xcode_settings": { + "OTHER_CPLUSPLUSFLAGS": [ + "-stdlib=libc++" + ], + "OTHER_LDFLAGS": [ + "-stdlib=libc++" + ] + } + } ] ], } ], diff --git a/lib/sdk/adapters/usbboot/usb.js b/lib/sdk/adapters/usbboot/usb.js index df5460d9..7cf78930 100644 --- a/lib/sdk/adapters/usbboot/usb.js +++ b/lib/sdk/adapters/usbboot/usb.js @@ -80,7 +80,9 @@ exports.listDevices = () => { // due to C Runtime issues on Windows; // see https://github.com/resin-io/etcher/issues/1956 try { + /* eslint-disable node/no-missing-require */ const winusbDriverGenerator = require('winusb-driver-generator') + /* eslint-enable node/no-missing-require */ for (const device of winusbDriverGenerator.listDriverlessDevices()) { devices.push({ accessible: false, diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 66a2112c..9cc2d4ec 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -2371,12 +2371,12 @@ "dev": true }, "drivelist": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/drivelist/-/drivelist-6.4.2.tgz", + "version": "6.4.6", + "resolved": "https://registry.npmjs.org/drivelist/-/drivelist-6.4.6.tgz", "dependencies": { "nan": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz" + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz" } } }, @@ -5305,12 +5305,12 @@ "resolved": "https://registry.npmjs.org/moment-duration-format/-/moment-duration-format-2.2.2.tgz" }, "mountutils": { - "version": "1.3.15", - "resolved": "https://registry.npmjs.org/mountutils/-/mountutils-1.3.15.tgz", + "version": "1.3.16", + "resolved": "https://registry.npmjs.org/mountutils/-/mountutils-1.3.16.tgz", "dependencies": { "nan": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz" + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz" } } }, @@ -6880,6 +6880,10 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz" }, + "drivelist": { + "version": "6.4.6", + "resolved": "https://registry.npmjs.org/drivelist/-/drivelist-6.4.6.tgz" + }, "figures": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz" @@ -6910,6 +6914,10 @@ "version": "3.10.1", "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz" }, + "nan": { + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz" + }, "onetime": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz" @@ -8156,8 +8164,8 @@ }, "unbzip2-stream": { "version": "1.2.5", - "from": "resin-io-modules/unbzip2-stream#core-streams", - "resolved": "git://github.com/resin-io-modules/unbzip2-stream.git#942fc218013c14adab01cf693b0500cf6ac83193" + "from": "balena-io-modules/unbzip2-stream#core-streams", + "resolved": "git://github.com/balena-io-modules/unbzip2-stream.git#942fc218013c14adab01cf693b0500cf6ac83193" }, "unc-path-regex": { "version": "0.1.2", @@ -8306,8 +8314,8 @@ }, "usb": { "version": "1.3.5", - "from": "resin-io/node-usb#1.3.5", - "resolved": "git://github.com/resin-io/node-usb.git#1521d10bdfe09ef2ca1f259972dee27c6c35f821" + "from": "balena-io/node-usb#1.3.5", + "resolved": "git://github.com/balena-io/node-usb.git#1521d10bdfe09ef2ca1f259972dee27c6c35f821" }, "use": { "version": "3.1.1", @@ -8793,16 +8801,6 @@ "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz", "dev": true }, - "winusb-driver-generator": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/winusb-driver-generator/-/winusb-driver-generator-1.2.1.tgz", - "dependencies": { - "nan": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz" - } - } - }, "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", @@ -8872,7 +8870,7 @@ }, "xxhash": { "version": "0.2.4", - "resolved": "https://registry.npmjs.org/xxhash/-/xxhash-0.2.4.tgz" + "resolved": "git://github.com/balena-io-modules/node-xxhash.git#70ac31da1a41c6f8c53d931b5802c6c93f7b6b83" }, "y18n": { "version": "3.2.1", diff --git a/package.json b/package.json index 5e788b04..05a0482e 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,8 @@ "7zip-bin-mac", "7zip-bin-win", "7zip-bin-linux", - "fsevents" + "fsevents", + "winusb-driver-generator" ], "dependencies": { "@fortawesome/fontawesome-free-webfonts": "^1.0.9", @@ -59,7 +60,7 @@ "color": "2.0.1", "command-join": "2.0.0", "debug": "3.1.0", - "drivelist": "6.4.2", + "drivelist": "6.4.6", "electron-is-running-in-asar": "1.0.0", "file-type": "4.1.0", "flexboxgrid": "6.3.0", @@ -70,7 +71,7 @@ "lzma-native": "1.5.2", "mbr": "1.1.2", "mime-types": "2.1.15", - "mountutils": "1.3.15", + "mountutils": "1.3.16", "nan": "2.9.2", "node-ipc": "9.1.1", "node-stream-zip": "1.3.7", @@ -95,15 +96,17 @@ "styled-system": "3.1.11", "sudo-prompt": "8.2.3", "udif": "0.13.0", - "unbzip2-stream": "github:resin-io-modules/unbzip2-stream#core-streams", - "usb": "github:resin-io/node-usb#1.3.5", + "unbzip2-stream": "github:balena-io-modules/unbzip2-stream#core-streams", + "usb": "github:balena-io/node-usb#1.3.5", "uuid": "3.0.1", - "winusb-driver-generator": "1.2.1", "xml2js": "0.4.17", - "xxhash": "0.2.4", + "xxhash": "git://github.com/balena-io-modules/node-xxhash.git#70ac31da1a41c6f8c53d931b5802c6c93f7b6b83", "yargs": "11.0.0", "yauzl": "2.6.0" }, + "optionalDependencies": { + "winusb-driver-generator": "1.2.3" + }, "devDependencies": { "angular-mocks": "1.6.3", "asar": "0.14.2", diff --git a/scripts/resin b/scripts/resin index 5961434e..1ef25962 160000 --- a/scripts/resin +++ b/scripts/resin @@ -1 +1 @@ -Subproject commit 5961434ebe3e24df23110333abffcbe02a69be49 +Subproject commit 1ef259620d0b51cb7865104c949c8fb682bfa742