Skip to content
This repository was archived by the owner on Oct 11, 2022. It is now read-only.

Commit c07d41a

Browse files
brianlovinbrianlovin
authored
Merge pull request #5066 from withspectrum/3.1.7
3.1.7
2 parents 5a1aa64 + 493f477 commit c07d41a

File tree

26 files changed

+456
-143
lines changed

26 files changed

+456
-143
lines changed

‎api/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"babel-plugin-transform-object-rest-spread": "^6.23.0",
1616
"babel-preset-env": "^1.7.0",
1717
"backpack-core": "^0.8.3",
18-
"body-parser": "^1.18.3",
19-
"bull": "^3.7.0",
18+
"body-parser": "^1.19.0",
19+
"bull": "^3.8.1",
2020
"casual": "^1.5.12",
2121
"compression": "^1.7.4",
2222
"cookie-parser": "^1.4.4",

‎api/yarn.lock

+81-9
Original file line numberDiff line numberDiff line change
@@ -2331,6 +2331,22 @@ [email protected], body-parser@^1.18.3:
23312331
raw-body "2.3.3"
23322332
type-is "~1.6.16"
23332333

2334+
body-parser@^1.19.0:
2335+
version "1.19.0"
2336+
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
2337+
integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
2338+
dependencies:
2339+
bytes "3.1.0"
2340+
content-type "~1.0.4"
2341+
debug "2.6.9"
2342+
depd "~1.1.2"
2343+
http-errors "1.7.2"
2344+
iconv-lite "0.4.24"
2345+
on-finished "~2.3.0"
2346+
qs "6.7.0"
2347+
raw-body "2.4.0"
2348+
type-is "~1.6.17"
2349+
23342350
boxen@^1.2.1:
23352351
version "1.3.0"
23362352
resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
@@ -2539,14 +2555,14 @@ builtin-status-codes@^3.0.0:
25392555
resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
25402556
integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
25412557

2542-
bull@^3.7.0:
2543-
version "3.7.0"
2544-
resolved "https://registry.yarnpkg.com/bull/-/bull-3.7.0.tgz#ec9a8721a2cfb0421c501d28553ac1f9f025414d"
2545-
integrity sha512-DHCALp+OOahK+q2hB3sZQew0CJn4W3zYIQsdMlnBCy7JYCnJ/bdj0MFHjo5k0ZhNZxzwhLErXt1yd3llV494UQ==
2558+
bull@^3.8.1:
2559+
version "3.8.1"
2560+
resolved "https://registry.yarnpkg.com/bull/-/bull-3.8.1.tgz#b31b53a2c829fee59135523e48523d873b3e5825"
2561+
integrity sha512-mpcrssn9+sWLRgPHBGfAHmIux1QuXKY3TypuoXG9L492Op234UWuwPXP2DZ+V223Nfv36FubxLdxyNC76BiEoQ==
25462562
dependencies:
25472563
cron-parser "^2.7.3"
25482564
debuglog "^1.0.0"
2549-
get-port latest
2565+
get-port "^4.2.0"
25502566
ioredis "^4.5.1"
25512567
lodash "^4.17.11"
25522568
p-timeout "^2.0.1"
@@ -2568,6 +2584,11 @@ [email protected]:
25682584
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
25692585
integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
25702586

2587+
[email protected]:
2588+
version "3.1.0"
2589+
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
2590+
integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
2591+
25712592
cacache@^11.0.2:
25722593
version "11.3.1"
25732594
resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.1.tgz#d09d25f6c4aca7a6d305d141ae332613aa1d515f"
@@ -4507,10 +4528,10 @@ get-caller-file@^1.0.1:
45074528
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
45084529
integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
45094530

4510-
get-port@latest:
4511-
version "4.1.0"
4512-
resolved "https://registry.yarnpkg.com/get-port/-/get-port-4.1.0.tgz#93eb3d5552c197497d76e9c389a6ac9920e20192"
4513-
integrity sha512-4/fqAYrzrzOiqDrdeZRKXGdTGgbkfTEumGlNQPeP6Jy8w0PzN9mzeNQ3XgHaTNie8pQ3hOUkrwlZt2Fzk5H9mA==
4531+
get-port@^4.2.0:
4532+
version "4.2.0"
4533+
resolved "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz#e37368b1e863b7629c43c5a323625f95cf24b119"
4534+
integrity sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==
45144535

45154536
get-stdin@^4.0.1:
45164537
version "4.0.1"
@@ -5032,6 +5053,17 @@ [email protected], http-errors@~1.6.2, http-errors@~1.6.3:
50325053
setprototypeof "1.1.0"
50335054
statuses ">= 1.4.0 < 2"
50345055

5056+
[email protected]:
5057+
version "1.7.2"
5058+
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
5059+
integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
5060+
dependencies:
5061+
depd "~1.1.2"
5062+
inherits "2.0.3"
5063+
setprototypeof "1.1.1"
5064+
statuses ">= 1.5.0 < 2"
5065+
toidentifier "1.0.0"
5066+
50355067
http-errors@^1.7.1:
50365068
version "1.7.1"
50375069
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.1.tgz#6a4ffe5d35188e1c39f872534690585852e1f027"
@@ -6709,6 +6741,11 @@ miller-rabin@^4.0.0:
67096741
bn.js "^4.0.0"
67106742
brorand "^1.0.1"
67116743

6744+
[email protected]:
6745+
version "1.40.0"
6746+
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
6747+
integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
6748+
67126749
"mime-db@>= 1.38.0 < 2":
67136750
version "1.38.0"
67146751
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
@@ -6726,6 +6763,13 @@ mime-types@^2.1.12, mime-types@~2.1.18, mime-types@~2.1.19:
67266763
dependencies:
67276764
mime-db "~1.37.0"
67286765

6766+
mime-types@~2.1.24:
6767+
version "2.1.24"
6768+
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
6769+
integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
6770+
dependencies:
6771+
mime-db "1.40.0"
6772+
67296773
[email protected]:
67306774
version "1.4.1"
67316775
resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
@@ -7835,6 +7879,11 @@ [email protected], qs@~6.5.2:
78357879
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
78367880
integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
78377881

7882+
[email protected]:
7883+
version "6.7.0"
7884+
resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
7885+
integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
7886+
78387887
[email protected]:
78397888
version "5.1.1"
78407889
resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
@@ -7919,6 +7968,16 @@ [email protected]:
79197968
iconv-lite "0.4.23"
79207969
unpipe "1.0.0"
79217970

7971+
[email protected]:
7972+
version "2.4.0"
7973+
resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
7974+
integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
7975+
dependencies:
7976+
bytes "3.1.0"
7977+
http-errors "1.7.2"
7978+
iconv-lite "0.4.24"
7979+
unpipe "1.0.0"
7980+
79227981
rc@^1.0.0, rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
79237982
version "1.2.8"
79247983
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
@@ -8760,6 +8819,11 @@ [email protected]:
87608819
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
87618820
integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
87628821

8822+
[email protected]:
8823+
version "1.1.1"
8824+
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
8825+
integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
8826+
87638827
sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8:
87648828
version "2.4.11"
87658829
resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
@@ -9581,6 +9645,14 @@ type-is@^1.6.12, type-is@^1.6.16, type-is@~1.6.16:
95819645
media-typer "0.3.0"
95829646
mime-types "~2.1.18"
95839647

9648+
type-is@~1.6.17:
9649+
version "1.6.18"
9650+
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
9651+
integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
9652+
dependencies:
9653+
media-typer "0.3.0"
9654+
mime-types "~2.1.24"
9655+
95849656
type-of@^2.0.1:
95859657
version "2.0.1"
95869658
resolved "https://registry.yarnpkg.com/type-of/-/type-of-2.0.1.tgz#e72a1741896568e9f628378d816d6912f7f23972"

‎chronos/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"start": "NODE_ENV=production node main.js"
44
},
55
"dependencies": {
6-
"aws-sdk": "^2.426.0",
7-
"bull": "^3.7.0",
6+
"aws-sdk": "^2.439.0",
7+
"bull": "^3.8.1",
88
"datadog-metrics": "^0.8.1",
99
"debug": "^4.1.1",
1010
"decode-uri-component": "^0.2.0",

‎chronos/yarn.lock

+13-13
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ asap@~2.0.3:
77
resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
88
integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
99

10-
aws-sdk@^2.426.0:
11-
version "2.426.0"
12-
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.426.0.tgz#cf17361c987daf518f945218f06135fbc1a3690d"
13-
integrity sha512-S4nmIhF/6iYeVEmKUWVG03zo1sw3zELoAPGqBKIZ3isrXbxkFXdP2cgIQxqi37zwWXSqaxt0xjeXVOMLzN6vSg==
10+
aws-sdk@^2.439.0:
11+
version "2.439.0"
12+
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.439.0.tgz#4a1d177507ef80b0b515c043938d814777645c40"
13+
integrity sha512-u7hCAMzpWbD6BqAwVHxr3cbm4YSbs0yv4crr7+bR/peM+UB6AbQLJFjFXx73dnIZq3R0Hr1bA7nh2Z9jkQLUdQ==
1414
dependencies:
1515
buffer "4.9.1"
1616
events "1.1.1"
@@ -62,14 +62,14 @@ buffer@^5.1.0:
6262
base64-js "^1.0.2"
6363
ieee754 "^1.1.4"
6464

65-
bull@^3.7.0:
66-
version "3.7.0"
67-
resolved "https://registry.yarnpkg.com/bull/-/bull-3.7.0.tgz#ec9a8721a2cfb0421c501d28553ac1f9f025414d"
68-
integrity sha512-DHCALp+OOahK+q2hB3sZQew0CJn4W3zYIQsdMlnBCy7JYCnJ/bdj0MFHjo5k0ZhNZxzwhLErXt1yd3llV494UQ==
65+
bull@^3.8.1:
66+
version "3.8.1"
67+
resolved "https://registry.yarnpkg.com/bull/-/bull-3.8.1.tgz#b31b53a2c829fee59135523e48523d873b3e5825"
68+
integrity sha512-mpcrssn9+sWLRgPHBGfAHmIux1QuXKY3TypuoXG9L492Op234UWuwPXP2DZ+V223Nfv36FubxLdxyNC76BiEoQ==
6969
dependencies:
7070
cron-parser "^2.7.3"
7171
debuglog "^1.0.0"
72-
get-port latest
72+
get-port "^4.2.0"
7373
ioredis "^4.5.1"
7474
lodash "^4.17.11"
7575
p-timeout "^2.0.1"
@@ -271,10 +271,10 @@ function-bind@^1.1.1:
271271
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
272272
integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
273273

274-
get-port@latest:
275-
version "4.1.0"
276-
resolved "https://registry.yarnpkg.com/get-port/-/get-port-4.1.0.tgz#93eb3d5552c197497d76e9c389a6ac9920e20192"
277-
integrity sha512-4/fqAYrzrzOiqDrdeZRKXGdTGgbkfTEumGlNQPeP6Jy8w0PzN9mzeNQ3XgHaTNie8pQ3hOUkrwlZt2Fzk5H9mA==
274+
get-port@^4.2.0:
275+
version "4.2.0"
276+
resolved "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz#e37368b1e863b7629c43c5a323625f95cf24b119"
277+
integrity sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==
278278

279279
has-symbols@^1.0.0:
280280
version "1.0.0"

‎cypress/integration/channel/view/members_spec.js

-29
This file was deleted.

‎cypress/integration/channel/view/profile_spec.js

+4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ describe('public channel', () => {
3939
it('should render profile', () => {
4040
cy.get('[data-cy="channel-view"]').should('be.visible');
4141
});
42+
43+
it('should render search input', () => {
44+
cy.get('[data-cy="channel-search-input"]').should('be.visible');
45+
});
4246
});
4347

4448
describe('public channel in private community signed out', () => {

‎cypress/integration/channel/view/search_spec.js

-19
This file was deleted.

‎cypress/integration/thread/action_bar_spec.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,10 @@ describe('action bar renders', () => {
211211

212212
// undo the edit
213213
openSettingsDropdown();
214-
cy.get('[data-cy="thread-actions-dropdown-trigger"]').should(
215-
'be.visible'
216-
);
214+
cy.get('[data-cy="thread-actions-dropdown-trigger"]')
215+
.should('be.visible')
216+
.last()
217+
.click();
217218
cy.get('[data-cy="thread-dropdown-edit"]').click();
218219
cy.get('[data-cy="save-thread-edit-button"]').should('be.visible');
219220
const originalTitle = 'The first thread! 🎉';

‎mercury/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"start": "NODE_ENV=production node main.js"
44
},
55
"dependencies": {
6-
"bull": "^3.7.0",
6+
"bull": "^3.8.1",
77
"datadog-metrics": "^0.8.1",
88
"debug": "^4.1.1",
99
"ioredis": "3.2.2",

‎mercury/yarn.lock

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ bignumber.js@~1.1.1:
1212
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
1313
integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
1414

15-
bull@^3.7.0:
16-
version "3.7.0"
17-
resolved "https://registry.yarnpkg.com/bull/-/bull-3.7.0.tgz#ec9a8721a2cfb0421c501d28553ac1f9f025414d"
18-
integrity sha512-DHCALp+OOahK+q2hB3sZQew0CJn4W3zYIQsdMlnBCy7JYCnJ/bdj0MFHjo5k0ZhNZxzwhLErXt1yd3llV494UQ==
15+
bull@^3.8.1:
16+
version "3.8.1"
17+
resolved "https://registry.yarnpkg.com/bull/-/bull-3.8.1.tgz#b31b53a2c829fee59135523e48523d873b3e5825"
18+
integrity sha512-mpcrssn9+sWLRgPHBGfAHmIux1QuXKY3TypuoXG9L492Op234UWuwPXP2DZ+V223Nfv36FubxLdxyNC76BiEoQ==
1919
dependencies:
2020
cron-parser "^2.7.3"
2121
debuglog "^1.0.0"
22-
get-port latest
22+
get-port "^4.2.0"
2323
ioredis "^4.5.1"
2424
lodash "^4.17.11"
2525
p-timeout "^2.0.1"
@@ -160,10 +160,10 @@ function-bind@^1.1.1:
160160
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
161161
integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
162162

163-
get-port@latest:
164-
version "4.1.0"
165-
resolved "https://registry.yarnpkg.com/get-port/-/get-port-4.1.0.tgz#93eb3d5552c197497d76e9c389a6ac9920e20192"
166-
integrity sha512-4/fqAYrzrzOiqDrdeZRKXGdTGgbkfTEumGlNQPeP6Jy8w0PzN9mzeNQ3XgHaTNie8pQ3hOUkrwlZt2Fzk5H9mA==
163+
get-port@^4.2.0:
164+
version "4.2.0"
165+
resolved "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz#e37368b1e863b7629c43c5a323625f95cf24b119"
166+
integrity sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==
167167

168168
has-symbols@^1.0.0:
169169
version "1.0.0"

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Spectrum",
3-
"version": "3.1.6",
3+
"version": "3.1.7",
44
"license": "BSD-3-Clause",
55
"devDependencies": {
66
"@babel/preset-flow": "^7.0.0",

0 commit comments

Comments
 (0)