Skip to content

Commit

Permalink
Merge branch 'balderdashy:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
CyBot authored Sep 13, 2023
2 parents 9f1f3f6 + db7aad2 commit b1f7763
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
language: node_js

node_js:
- "10"
- "12"
- "14"
- "node"
- "16"

branches:
only:
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# sails-hook-sockets changelog

### 2.0.1

* Upgraded socket.io from 2.2.0 to 2.4.1 to resolve deprecation warning

### 2.0.0

* Upgraded machinepack-redis to resolve vulnerability/deprecation warnings (note this includes a major version bump of redis, the Redis client library)
* Upgraded machinepack-urls to resolve vulnerability/deprecation warnings
* Upgraded socket.io from 2.0.3 to 2.2.0 to resolve deprecation warning

### 1.1.0

* [UPGRADE] Update [socket.io](http://socket.io) dependency to version 1.5.1.
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sails-hook-sockets",
"version": "2.0.1",
"version": "2.0.4",
"description": "Implements socket.io support in Sails",
"keywords": [
"socket.io",
Expand All @@ -10,13 +10,13 @@
],
"dependencies": {
"@sailshq/lodash": "^3.10.2",
"async": "2.0.1",
"async": "2.6.4",
"flaverr": "^1.0.0",
"machinepack-redis": "^2.0.3",
"machinepack-urls": "^6.0.2-0",
"proxy-addr": "1.1.5",
"semver": "4.3.6",
"socket.io": "2.4.1",
"semver": "7.5.2",
"socket.io": "2.5.0",
"uid2": "0.0.3"
},
"devDependencies": {
Expand Down

0 comments on commit b1f7763

Please sign in to comment.