diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index f7e2530..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "vendor/protocol"] - path = vendor/protocol - url = git://github.com/faye/websocket-protocol-node.git diff --git a/lib/faye/eventsource.js b/lib/faye/eventsource.js index 2b4e596..9c7d077 100644 --- a/lib/faye/eventsource.js +++ b/lib/faye/eventsource.js @@ -1,6 +1,6 @@ var Stream = require('stream').Stream, util = require('util'), - driver = require('../../vendor/protocol/lib/websocket/driver'), + driver = require('websocket-driver'), API = require('./websocket/api'), EventTarget = require('./websocket/api/event_target'), Event = require('./websocket/api/event'); diff --git a/lib/faye/websocket.js b/lib/faye/websocket.js index 31e95b7..d6d9c5b 100644 --- a/lib/faye/websocket.js +++ b/lib/faye/websocket.js @@ -5,7 +5,7 @@ // * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#interface-event var util = require('util'), - driver = require('../../vendor/protocol/lib/websocket/driver'), + driver = require('websocket-driver'), API = require('./websocket/api'); var WebSocket = function(request, socket, body, protocols, options) { diff --git a/lib/faye/websocket/client.js b/lib/faye/websocket/client.js index 43ac7c9..acfb1e4 100644 --- a/lib/faye/websocket/client.js +++ b/lib/faye/websocket/client.js @@ -1,7 +1,7 @@ var util = require('util'), net = require('net'), tls = require('tls'), - driver = require('../../../vendor/protocol/lib/websocket/driver'), + driver = require('websocket-driver'), API = require('./api'); var Client = function(url, protocols, options) { diff --git a/package.json b/package.json index 2a61244..3a50a5d 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ , "version" : "0.4.4" , "engines" : {"node": ">=0.4.0"} , "main" : "./lib/faye/websocket" +, "dependencies" : {"websocket-driver": ""} , "devDependencies" : {"jsclass": "", "pace": ""} , "scripts" : {"test": "node spec/runner.js"} diff --git a/vendor/protocol b/vendor/protocol deleted file mode 160000 index aa25393..0000000 --- a/vendor/protocol +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aa25393a6cab433f0e1e421bdc2457d710bcce63