Skip to content

Commit e1e6bf1

Browse files
author
Robert Jackson
authored
Merge pull request #695 from rwjblue/drop-node-6
Drop Node 6, 8, 9, 11, and 13 support.
2 parents 114a2ad + fc00ca8 commit e1e6bf1

4 files changed

Lines changed: 25 additions & 35 deletions

File tree

.travis.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
language: node_js
33
node_js:
4-
- "6"
5-
- "8"
4+
- "10"
5+
- "12"
66

77
branches:
88
only:
@@ -13,9 +13,6 @@ branches:
1313
env:
1414
- CXX=g++-4.8 WORKER_COUNT=2
1515

16-
sudo: false
17-
dist: trusty
18-
1916
addons:
2017
apt:
2118
sources:

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
environment:
55
MOCHA_REPORTER: "mocha-appveyor-reporter"
66
matrix:
7-
- nodejs_version: "6"
8-
- nodejs_version: "8"
7+
- nodejs_version: "10"
8+
- nodejs_version: "12"
99

1010
branches:
1111
only:

package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,8 @@
7878
"request": "^2.88.0",
7979
"rsvp": "^4.8.3"
8080
},
81-
"resolutions": {
82-
"**/engine.io": "~3.3.0"
83-
},
8481
"engines": {
85-
"node": "6.* || 8.* || >= 10.*"
82+
"node": "10.* || 12.* || >= 14.*"
8683
},
8784
"publishConfig": {
8885
"registry": "https://registry.npmjs.org/"

yarn.lock

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,7 @@ async-disk-cache@^1.2.1:
12531253
rsvp "^3.0.18"
12541254
username-sync "^1.0.2"
12551255

1256-
async-limiter@~1.0.0:
1256+
async-limiter@^1.0.0, async-limiter@~1.0.0:
12571257
version "1.0.1"
12581258
resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
12591259
integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
@@ -1903,10 +1903,10 @@ [email protected]:
19031903
resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
19041904
integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
19051905

1906-
base64id@1.0.0:
1907-
version "1.0.0"
1908-
resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
1909-
integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
1906+
base64id@2.0.0:
1907+
version "2.0.0"
1908+
resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
1909+
integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
19101910

19111911
base@^0.11.1:
19121912
version "0.11.2"
@@ -4030,17 +4030,6 @@ engine.io-client@~3.4.0:
40304030
xmlhttprequest-ssl "~1.5.4"
40314031
yeast "0.1.2"
40324032

4033-
engine.io-parser@~2.1.0:
4034-
version "2.1.3"
4035-
resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
4036-
integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==
4037-
dependencies:
4038-
after "0.8.2"
4039-
arraybuffer.slice "~0.0.7"
4040-
base64-arraybuffer "0.1.5"
4041-
blob "0.0.5"
4042-
has-binary2 "~1.0.2"
4043-
40444033
engine.io-parser@~2.2.0:
40454034
version "2.2.0"
40464035
resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.0.tgz#312c4894f57d52a02b420868da7b5c1c84af80ed"
@@ -4052,17 +4041,17 @@ engine.io-parser@~2.2.0:
40524041
blob "0.0.5"
40534042
has-binary2 "~1.0.2"
40544043

4055-
engine.io@~3.3.0, engine.io@~3.4.0:
4056-
version "3.3.2"
4057-
resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.3.2.tgz#18cbc8b6f36e9461c5c0f81df2b830de16058a59"
4058-
integrity sha512-AsaA9KG7cWPXWHp5FvHdDWY3AMWeZ8x+2pUVLcn71qE5AtAzgGbxuclOytygskw8XGmiQafTmnI9Bix3uihu2w==
4044+
engine.io@~3.4.0:
4045+
version "3.4.0"
4046+
resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.0.tgz#3a962cc4535928c252759a00f98519cb46c53ff3"
4047+
integrity sha512-XCyYVWzcHnK5cMz7G4VTu2W7zJS7SM1QkcelghyIk/FmobWBtXE7fwhBusEKvCSqc3bMh8fNFMlUkCKTFRxH2w==
40594048
dependencies:
40604049
accepts "~1.3.4"
4061-
base64id "1.0.0"
4050+
base64id "2.0.0"
40624051
cookie "0.3.1"
4063-
debug "~3.1.0"
4064-
engine.io-parser "~2.1.0"
4065-
ws "~6.1.0"
4052+
debug "~4.1.0"
4053+
engine.io-parser "~2.2.0"
4054+
ws "^7.1.2"
40664055

40674056
ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2, ensure-posix-path@^1.1.0:
40684057
version "1.1.1"
@@ -9988,6 +9977,13 @@ write@^0.2.1:
99889977
dependencies:
99899978
mkdirp "^0.5.1"
99909979

9980+
ws@^7.1.2:
9981+
version "7.2.0"
9982+
resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.0.tgz#422eda8c02a4b5dba7744ba66eebbd84bcef0ec7"
9983+
integrity sha512-+SqNqFbwTm/0DC18KYzIsMTnEWpLwJsiasW/O17la4iDRRIO9uaHbvKiAS3AHgTiuuWerK/brj4O6MYZkei9xg==
9984+
dependencies:
9985+
async-limiter "^1.0.0"
9986+
99919987
ws@~6.1.0:
99929988
version "6.1.4"
99939989
resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"

0 commit comments

Comments
 (0)