From f66a977fc7ae30d2a07124ad91924c4ee638a703 Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Tue, 8 Jan 2019 22:16:58 +0100 Subject: Revert "Merge pull request #34387 from yhirano55/rails_info_properties_json" We had a discussion on the Core team and we don't want to expose this information as a JSON endpoint and not by default. It doesn't make sense to expose this JSON locally and this controller is only accessible in dev, so the proposed access from a production app seems off. This reverts commit 8eaffe7e89719ac62ff29c2e4208cfbeb1cd1c38, reversing changes made to b6e4305c3bca4c673996d0af9db0f4cfbf50215e. --- actioncable/actioncable.gemspec | 3 --- 1 file changed, 3 deletions(-) (limited to 'actioncable') diff --git a/actioncable/actioncable.gemspec b/actioncable/actioncable.gemspec index 29836f012f..c98ec9afc9 100644 --- a/actioncable/actioncable.gemspec +++ b/actioncable/actioncable.gemspec @@ -25,9 +25,6 @@ Gem::Specification.new do |s| "changelog_uri" => "https://github.com/rails/rails/blob/v#{version}/actioncable/CHANGELOG.md" } - # NOTE: Please read our dependency guidelines before updating versions: - # https://edgeguides.rubyonrails.org/security.html#dependency-management-and-cves - s.add_dependency "actionpack", version s.add_dependency "nio4r", "~> 2.0" -- cgit v1.2.3 From 647d7e61679ac4c28c081532ad0a0d7e1f80482b Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Tue, 8 Jan 2019 22:19:22 +0100 Subject: Revert "Revert "Merge pull request #34387 from yhirano55/rails_info_properties_json"" I reverted the wrong commit. Damn it. This reverts commit f66a977fc7ae30d2a07124ad91924c4ee638a703. --- actioncable/actioncable.gemspec | 3 +++ 1 file changed, 3 insertions(+) (limited to 'actioncable') diff --git a/actioncable/actioncable.gemspec b/actioncable/actioncable.gemspec index c98ec9afc9..29836f012f 100644 --- a/actioncable/actioncable.gemspec +++ b/actioncable/actioncable.gemspec @@ -25,6 +25,9 @@ Gem::Specification.new do |s| "changelog_uri" => "https://github.com/rails/rails/blob/v#{version}/actioncable/CHANGELOG.md" } + # NOTE: Please read our dependency guidelines before updating versions: + # https://edgeguides.rubyonrails.org/security.html#dependency-management-and-cves + s.add_dependency "actionpack", version s.add_dependency "nio4r", "~> 2.0" -- cgit v1.2.3 From 86b489e3d6a9efbefbc62e8531d0f5850934d4e1 Mon Sep 17 00:00:00 2001 From: Javan Makhmali Date: Wed, 9 Jan 2019 08:09:51 -0500 Subject: Move all npm packages to @rails scope Fixes #33083 --- actioncable/README.md | 6 +++--- .../rails/generators/channel/templates/javascript/consumer.js.tt | 2 +- actioncable/package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'actioncable') 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", -- cgit v1.2.3