Skip to content

Commit d694d9e

Browse files
committed
Merge branch 'main' of https://github.com/sockjs/sockjs-client into transport-headers
2 parents c594d46 + 19fb299 commit d694d9e

26 files changed

+12590
-4696
lines changed

.npmignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ dist/
55
!dist/sockjs.min.js
66
!dist/sockjs.min.js.map
77
build/
8-
.travis.yml
98
.eslintrc
109
.eslintignore
1110
.jscsrc
@@ -17,3 +16,4 @@ img/
1716
karma.conf.js
1817
build.sh
1918
.github/
19+
local.log

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.16.3
1+
12

.travis.yml

-14
This file was deleted.

Changelog.md

+42
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
1.6.1
2+
==
3+
Fixes
4+
* Update `eventsource` to `2.0.2` due to CVE-2022-1650. Fixes #590
5+
* Update `minimist` to `1.2.6`. Fixes #585
6+
7+
1.6.0
8+
==
9+
Fixes
10+
* Remove `agent: false` to allow usage of `globalAgent`. Fixes #421
11+
12+
dependencies
13+
* Update `url-parse` due to CVE-2022-0686, CVE-2022-0639, and CVE-2022-0512. Fixes #576
14+
* Remove `json3` dependency. Fixes #476
15+
* Update `eventsource` to `1.1.0`
16+
* Update `faye-websocket` to `0.11.4`
17+
* Update `debug` to `3.2.7`
18+
19+
devDependencies
20+
* Update `follow-redirects` (devDep) due to CVE-2022-0536 and CVE-2022-0155
21+
* Update `karma` (devDep) due to CVE-2022-0437
22+
* Update `cached-path-relative` (devDep) due to CVE-2021-23518
23+
* Update `fsevents` (devDep) to fix:
24+
* `ini` CVE-2020-7788
25+
* `minimist` CVE-2020-7598
26+
* `tar` CVE-2021-37713, CVE-2021-37701, CVE-2021-32804, CVE-2021-32803
27+
* Update `copy-props` (devDep) due to CVE-2020-28503
28+
* Update `eslint`, `mocha`, `gulp-replace`, `karma-browserify`, `gulp-sourcemaps`, and `browserify`
29+
30+
Other Changes
31+
* Remove bower
32+
* Remove Travis CI
33+
* Require Node.js 12
34+
35+
1.5.2
36+
==
37+
* Update `url-parse` due to CVE-2021-3664.
38+
39+
1.5.1
40+
==
41+
* Update `url-parse` due to CVE-2021-27515.
42+
143
1.5.0
244
==
345
* Update `url-parse`, `kind-of`, `minimist`, `websocket-extensions` due to security vulnerabilies.

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# SockJS-client
33

4-
[![npm version](https://img.shields.io/npm/v/sockjs-client.svg?style=flat-square)](https://www.npmjs.com/package/sockjs-client)[![Build Status](https://img.shields.io/travis/sockjs/sockjs-client/master.svg?style=flat-square)](https://travis-ci.org/sockjs/sockjs-client)[![Dependencies](https://img.shields.io/librariesio/release/npm/sockjs-client.svg?style=flat-square)](https://libraries.io/npm/sockjs-client)[![Chat](https://img.shields.io/badge/Chat-gitter.im-blue.svg?style=flat-square)](https://gitter.im/sockjs/sockjs-client)[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg?style=flat-square)](CODE_OF_CONDUCT.md)
4+
[![npm version](https://img.shields.io/npm/v/sockjs-client.svg?style=flat-square)](https://www.npmjs.com/package/sockjs-client)[![Dependencies](https://img.shields.io/librariesio/release/npm/sockjs-client.svg?style=flat-square)](https://libraries.io/npm/sockjs-client)[![Chat](https://img.shields.io/badge/Chat-gitter.im-blue.svg?style=flat-square)](https://gitter.im/sockjs/sockjs-client)[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg?style=flat-square)](CODE_OF_CONDUCT.md)
55
[![BrowserStack Status](https://automate.browserstack.com/badge.svg?badge_key=N3V0cStKM3RtUy9Bb2l2cHFhMVdobTZnUitBZ1lLcUkwYnl2TWgyMHppQT0tLWxncU5UeTdLb0Rqc1VQQTI5SklRelE9PQ==--596ccf9d3cd2f462f1043ee6803a9405e00446ac)](https://automate.browserstack.com/public-build/N3V0cStKM3RtUy9Bb2l2cHFhMVdobTZnUitBZ1lLcUkwYnl2TWgyMHppQT0tLWxncU5UeTdLb0Rqc1VQQTI5SklRelE9PQ==--596ccf9d3cd2f462f1043ee6803a9405e00446ac)
66

77
<a href="https://www.netlify.com">
@@ -124,7 +124,7 @@ SockJS server. Here's a simple example:
124124

125125
## SockJS class
126126

127-
Similar to the 'WebSocket' API, the 'SockJS' constructor takes one, or more arguments:
127+
Similar to the 'WebSocket' API, the 'SockJS' constructor takes one or more arguments:
128128

129129
```javascript
130130
var sockjs = new SockJS(url, _reserved, options);

bower.json

-30
This file was deleted.

build.sh

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ set -e
44
if [ "x${BROWSER}" = "x" ]; then
55
npm run lint
66
npm test
7-
elif [ "${TRAVIS_SECURE_ENV_VARS}" = "true" ]; then
8-
npm run test:browser_remote
97
else
108
exit 1
119
fi

0 commit comments

Comments
 (0)