diff options
author | Aaron Patterson <tenderlove@github.com> | 2019-01-11 11:21:53 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-11 11:21:53 -0800 |
commit | 74bef0970fff60eaf5faefde30a23f3c36c0b3ee (patch) | |
tree | 628b6013130e0d2868b2afbac3f00f24629dbb9c /actioncable | |
parent | 1e923b498492424ae627d7a2c61339148f887503 (diff) | |
parent | 3a1b2a21965c0cd7bcccff586ce04b029eb4c359 (diff) | |
download | rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.tar.gz rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.tar.bz2 rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.zip |
Merge branch 'master' into ac_params_exists
Diffstat (limited to 'actioncable')
-rw-r--r-- | actioncable/README.md | 6 | ||||
-rw-r--r-- | actioncable/lib/rails/generators/channel/templates/javascript/consumer.js.tt | 2 | ||||
-rw-r--r-- | actioncable/package.json | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/actioncable/README.md b/actioncable/README.md index a2783d6f45..84cf817d74 100644 --- a/actioncable/README.md +++ b/actioncable/README.md @@ -504,7 +504,7 @@ WebSocket functionality. ### Installation ``` -npm install actioncable --save +npm install @rails/actioncable --save ``` ### Usage @@ -516,7 +516,7 @@ provided. In JavaScript... ```javascript -ActionCable = require('actioncable') +ActionCable = require('@rails/actioncable') var cable = ActionCable.createConsumer('wss://RAILS-API-PATH.com/cable') @@ -528,7 +528,7 @@ cable.subscriptions.create('AppearanceChannel', { and in CoffeeScript... ```coffeescript -ActionCable = require('actioncable') +ActionCable = require('@rails/actioncable') cable = ActionCable.createConsumer('wss://RAILS-API-PATH.com/cable') diff --git a/actioncable/lib/rails/generators/channel/templates/javascript/consumer.js.tt b/actioncable/lib/rails/generators/channel/templates/javascript/consumer.js.tt index 76ca3d0f2f..eec7e54b8a 100644 --- a/actioncable/lib/rails/generators/channel/templates/javascript/consumer.js.tt +++ b/actioncable/lib/rails/generators/channel/templates/javascript/consumer.js.tt @@ -1,6 +1,6 @@ // Action Cable provides the framework to deal with WebSockets in Rails. // You can generate new channels where WebSocket features live using the `rails generate channel` command. -import ActionCable from "actioncable" +import ActionCable from "@rails/actioncable" export default ActionCable.createConsumer() diff --git a/actioncable/package.json b/actioncable/package.json index db78c1a09a..69a97939fb 100644 --- a/actioncable/package.json +++ b/actioncable/package.json @@ -1,5 +1,5 @@ { - "name": "actioncable", + "name": "@rails/actioncable", "version": "6.0.0-alpha", "description": "WebSocket framework for Ruby on Rails.", "main": "app/assets/javascripts/action_cable.js", |