Merge pull request #230 from NordicSemiconductor/update/electron-5

Update for electron 5

azure-pipelines.yml

@@ -95,6 +95,12 @@ jobs:
  nodeArch: $(nodeArch)
  npmConfigRuntime: 'electron'
  npmConfigTarget: 4.1.4
+ - template: azure-node.yml
+ parameters:
+ nodeVersion: 10.15.0
+ nodeArch: $(nodeArch)
+ npmConfigRuntime: 'electron'
+ npmConfigTarget: 5.0.6
 
  # Relese draft of artefacts in $(Build.ArtifactStagingDirectory).
  - task: GitHubRelease@0

package.json

@@ -1,6 +1,6 @@
 {
  "name": "pc-ble-driver-js",
- "version": "2.6.0",
+ "version": "2.6.1",
  "description": "Javascript bindings for pc-ble-driver",
  "main": "index.js",
  "scripts": {
@@ -42,43 +42,43 @@
  ]
  },
  "dependencies": {
- "axios": "^0.18.0",
- "bindings": "^1.2.1",
- "change-case": "2.3.0",
+ "axios": "^0.19.0",
+ "bindings": "^1.5.0",
+ "change-case": "3.1.0",
  "cmake-js": "5.1.1",
- "crc": "^3.4.0",
- "jszip": "^3.1.2",
+ "crc": "^3.8.0",
+ "jszip": "^3.2.2",
  "mkdirp": "^0.5.1",
  "nan": "^2.12.1",
- "node-pre-gyp": "^0.12.0",
- "nrf-device-setup": "^0.4.5",
- "tar": "^4.4.8",
- "underscore": "^1.8.3"
+ "node-pre-gyp": "^0.13.0",
+ "nrf-device-setup": "^0.5.1",
+ "tar": "^4.4.10",
+ "underscore": "^1.9.1"
  },
  "devDependencies": {
- "babel-preset-env": "^1.6.1",
- "chai": "3.3.0",
- "debug": "3.1.0",
- "eslint": "^3.16.0",
- "eslint-config-airbnb": "^14.1.0",
- "eslint-plugin-import": "^2.2.0",
- "eslint-plugin-jsx-a11y": "^4.0.0",
- "eslint-plugin-react": "^6.10.0",
- "gh-pages": "^1.0.0",
+ "babel-preset-env": "^1.7.0",
+ "chai": "4.2.0",
+ "debug": "4.1.0",
+ "eslint": "^6.0.1",
+ "eslint-config-airbnb": "^17.1.1",
+ "eslint-plugin-import": "^2.18.0",
+ "eslint-plugin-jsx-a11y": "^6.2.3",
+ "eslint-plugin-react": "^7.14.2",
+ "gh-pages": "^2.0.1",
  "jest": "^24.8.0",
  "jest-bamboo-formatter": "1.0.1",
- "jest-serializer-path": "^0.1.14",
- "jscs": "^2.3.5",
- "jsdoc": "^3.4.3",
- "jshint": "^2.8.0",
+ "jest-serializer-path": "^0.1.15",
+ "jscs": "^3.0.7",
+ "jsdoc": "^3.6.2",
+ "jshint": "^2.10.2",
  "keypress": "0.2.1",
  "minami": "^1.2.3",
- "mocha": "^2.3.3",
- "node-pre-gyp-github": "1.3.1",
- "nrf-device-lister": "^2.1.2",
- "proxyquire": "^1.7.3",
- "sinon": "^1.17.1",
- "yargs": "^3.29.0"
+ "mocha": "^6.1.4",
+ "node-pre-gyp-github": "1.4.3",
+ "nrf-device-lister": "^2.2.1",
+ "proxyquire": "^2.1.0",
+ "sinon": "^7.3.2",
+ "yargs": "^13.2.4"
  },
  "files": [
  "api/",

src/common.cpp

@@ -725,7 +725,7 @@ bool Utility::Set(v8::Handle<v8::Object> target, const char *name, v8::Local<v8:
 
 bool Utility::Has(v8::Handle<v8::Object> target, const char *name)
 {
- return target->Has(Nan::New(name).ToLocalChecked());
+ return target->Has(target->CreationContext(), Nan::New(name).ToLocalChecked()).FromMaybe(false);
 }
 
 void Utility::SetReturnValue(Nan::NAN_METHOD_ARGS_TYPE info, v8::Local<v8::Object> value)