Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix remaining depend/package issues; Misc updates #237

Merged
merged 4 commits into from
Dec 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## 1.0.0

- Upgraded Node to v12
- Upgraded and removed deprecated and vulnerable depends/packages
- Fixed compatiility with v3 of wss (Websockets) package
- Removed phantomjs and related mocha components and migrated to mocha-chrome
- Added ultraleap to bower keywords


## 0.6.4
- Expose EventEmitter and _ on Leap
- Fixes #190 Cannot pass in Leap.loop options without callback
Expand Down
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ module.exports = function(grunt){

},
exec: {
'test-browser': './node_modules/.bin/mocha-phantomjs -R dot test/helpers/browser.html',
'test-browser': './node_modules/.bin/mocha-chrome -R dot test/helpers/browser.html',
// -i -g stands for inverse grep. Tests tagged browser-only will be excluded.
'test-node': './node_modules/.bin/mocha lib/index.js test/helpers/node.js test/*.js -R dot -i -g browser-only',
'test-integration': 'node integration_test/reconnection.js && node integration_test/protocol_versions.js'
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ test: build test-only
test-only: test-node test-browser test-integration

test-browser:
./node_modules/.bin/mocha-phantomjs -R dot test/helpers/browser.html
./node_modules/.bin/mocha-chrome -R dot test/helpers/browser.html

test-node:
./node_modules/.bin/mocha lib/index.js test/helpers/node.js test/*.js -R dot
Expand Down
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"main": "leap-1.0.0.js",
"keywords": [
"leap",
"leapmotion"
"leapmotion",
"ultraleap"
],
"ignore": [
"**/.*",
Expand Down
2 changes: 1 addition & 1 deletion leap-1.0.0.js
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ BrowserConnection.prototype.setupSocket = function() {
socket.onerror = function(error) {

// attempt to degrade to ws: after one failed attempt for older Leap Service installations.
if (!connection.useSecure() && connection.scheme === 'wss:'){
if (connection.useSecure() && connection.scheme === 'wss:'){
connection.scheme = 'ws:';
connection.port = 6437;
connection.disconnect();
Expand Down
2 changes: 1 addition & 1 deletion leap-1.0.0.min.js

Large diffs are not rendered by default.