Skip to content

Commit 8241ae3

Browse files
authored
Update @rails/actioncable dependency to version >=7.0 (#705)
* Update @rails/actioncable dependency to version >=7.0 * yarn build
1 parent dd6ab1b commit 8241ae3

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

app/assets/javascripts/turbo.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5490,8 +5490,8 @@ window.Turbo = Turbo$1;
54905490
addEventListener("turbo:before-fetch-request", encodeMethodIntoRequestBody);
54915491

54925492
var adapters = {
5493-
logger: self.console,
5494-
WebSocket: self.WebSocket
5493+
logger: typeof console !== "undefined" ? console : undefined,
5494+
WebSocket: typeof WebSocket !== "undefined" ? WebSocket : undefined
54955495
};
54965496

54975497
var logger = {
@@ -5533,12 +5533,11 @@ class ConnectionMonitor {
55335533
isRunning() {
55345534
return this.startedAt && !this.stoppedAt;
55355535
}
5536-
recordPing() {
5536+
recordMessage() {
55375537
this.pingedAt = now();
55385538
}
55395539
recordConnect() {
55405540
this.reconnectAttempts = 0;
5541-
this.recordPing();
55425541
delete this.disconnectedAt;
55435542
logger.log("ConnectionMonitor recorded connect");
55445543
}
@@ -5737,6 +5736,7 @@ Connection.prototype.events = {
57375736
return;
57385737
}
57395738
const {identifier: identifier, message: message, reason: reason, reconnect: reconnect, type: type} = JSON.parse(event.data);
5739+
this.monitor.recordMessage();
57405740
switch (type) {
57415741
case message_types.welcome:
57425742
if (this.triedToReconnect()) {
@@ -5752,7 +5752,7 @@ Connection.prototype.events = {
57525752
});
57535753

57545754
case message_types.ping:
5755-
return this.monitor.recordPing();
5755+
return null;
57565756

57575757
case message_types.confirmation:
57585758
this.subscriptions.confirmSubscription(identifier);

app/assets/javascripts/turbo.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/assets/javascripts/turbo.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
"dependencies": {
2222
"@hotwired/turbo": "^8.0.13",
23-
"@rails/actioncable": "^7.0"
23+
"@rails/actioncable": ">=7.0"
2424
},
2525
"devDependencies": {
2626
"@rollup/plugin-node-resolve": "^11.0.1",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@
6969
"@jridgewell/resolve-uri" "^3.1.0"
7070
"@jridgewell/sourcemap-codec" "^1.4.14"
7171

72-
"@rails/actioncable@^7.0":
73-
version "7.1.1"
74-
resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.1.1.tgz#e8c49769d41f35a4473133c259cc98adc04dddf8"
75-
integrity sha512-ZRJ9rdwFQQjRbtgJnweY0/4UQyxN6ojEGRdib0JkjnuIciv+4ok/aAeZmBJqNreTMaBqS0eHyA9hCArwN58opg==
72+
"@rails/actioncable@>=7.0":
73+
version "8.0.100"
74+
resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-8.0.100.tgz#83733a8fa35be5d085cf0fe10b341d0428022bc0"
75+
integrity sha512-/vXTG6gzSW0CDqmA0hWasZ1UAGZC7g5NGM21jowh58rCCeTHAGbWwKExHn49VDuYXz+cHbL4MGfc5LMdTp9m3A==
7676

7777
"@rollup/plugin-node-resolve@^11.0.1":
7878
version "11.2.1"

0 commit comments

Comments
 (0)