Skip to content

Commit 91c24aa

Browse files
committed
Revert "use a parser that supports circular json"
This reverts commit c052f44.
1 parent 05a4247 commit 91c24aa

File tree

7 files changed

+3
-24
lines changed

7 files changed

+3
-24
lines changed

packages/extension/app/background.coffee

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ map = require("lodash/map")
22
pick = require("lodash/pick")
33
once = require("lodash/once")
44
Promise = require("bluebird")
5-
{ circularParser } = require("@packages/socket")
65

76
HOST = "CHANGE_ME_HOST"
87
PATH = "CHANGE_ME_PATH"
@@ -42,11 +41,7 @@ connect = (host, path, io) ->
4241

4342
## cannot use required socket here due
4443
## to bug in socket io client with browserify
45-
client = io.connect(host, {
46-
path: path,
47-
transports: ["websocket"]
48-
parser: circularParser
49-
})
44+
client = io.connect(host, {path: path, transports: ["websocket"]})
5045

5146
client.on "automation:request", (id, msg, data) ->
5247
switch msg

packages/runner/src/lib/event-manager.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import $Cypress, { $ } from '@packages/driver'
1212
const channel = io.connect({
1313
path: '/__socket.io',
1414
transports: ['websocket'],
15-
parser: io.circularParser,
1615
})
1716

1817
channel.on('connect', () => {

packages/server/lib/socket.coffee

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ class Socket
124124
destroyUpgrade: false
125125
serveClient: false
126126
cookie: cookie
127-
parser: socketIo.circularParser
128127
})
129128

130129
startListening: (server, automation, config, options) ->

packages/server/test/integration/websockets_spec.coffee

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,6 @@ describe "Web Sockets", ->
175175
@wsClient = socketIo.client(@cfg.proxyUrl, {
176176
path: @cfg.socketIoRoute
177177
transports: ["websocket"]
178-
parser: socketIo.circularParser
179-
rejectUnauthorized: false
180178
})
181179
@wsClient.on "connect", -> done()
182180

@@ -199,8 +197,6 @@ describe "Web Sockets", ->
199197
agent: agent
200198
path: @cfg.socketIoRoute
201199
transports: ["websocket"]
202-
parser: socketIo.circularParser
203-
rejectUnauthorized: false
204200
})
205201
@wsClient.on "connect", -> done()
206202

@@ -224,8 +220,6 @@ describe "Web Sockets", ->
224220
@wsClient = socketIo.client("https://localhost:#{wssPort}", {
225221
agent: agent
226222
path: @cfg.socketIoRoute
227-
parser: socketIo.circularParser
228-
rejectUnauthorized: false
229223
})
230224
@wsClient.on "connect", -> done()
231225

packages/socket/lib/client.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
const circularParser = require('socket.io-circular-parser')
2-
31
module.exports = require('socket.io-client')
4-
5-
module.exports.circularParser = circularParser

packages/socket/lib/socket.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@ const server = require('socket.io')
44
const version = require('socket.io-client/package.json').version
55
const clientPath = require.resolve('socket.io-client')
66
const client = require('./client')
7-
const circularParser = require('socket.io-circular-parser')
87

98
module.exports = {
109
server,
1110

1211
client,
1312

14-
circularParser,
15-
1613
getPathToClientSource () {
1714
// clientPath returns the path to socket.io-client/lib/index.js
1815
// so walk up two levels to get to the root

packages/socket/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
"lib"
1818
],
1919
"dependencies": {
20-
"socket.io": "2.2.0",
21-
"socket.io-circular-parser": "3.1.2",
22-
"socket.io-client": "2.2.0"
20+
"socket.io": "1.7.4",
21+
"socket.io-client": "1.7.4"
2322
},
2423
"devDependencies": {
2524
"bin-up": "1.2.0",

0 commit comments

Comments
 (0)