Merge pull request #34949 from javan/js/compact-start

Minimize boilerplate setup code for JavaScript libraries

2 files changed, 6 insertions, 12 deletions

diff --git a/railties/lib/rails/generators/rails/app/templates/app/javascript/channels/consumer.js b/railties/lib/rails/generators/rails/app/templates/app/javascript/channels/consumer.js
index eec7e54b8a..0eceb59b18 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/javascript/channels/consumer.js
+++ b/railties/lib/rails/generators/rails/app/templates/app/javascript/channels/consumer.js
@@ -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 "@rails/actioncable"
+import { createConsumer } from "@rails/actioncable"
 
-export default ActionCable.createConsumer()
+export default createConsumer()
diff --git a/railties/lib/rails/generators/rails/app/templates/app/javascript/packs/application.js.tt b/railties/lib/rails/generators/rails/app/templates/app/javascript/packs/application.js.tt
index de91713546..908487d500 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/javascript/packs/application.js.tt
+++ b/railties/lib/rails/generators/rails/app/templates/app/javascript/packs/application.js.tt
@@ -3,19 +3,13 @@
 // a relevant structure within app/javascript and only use these pack files to reference
 // that code so it'll be compiled.
 
-import Rails from "@rails/ujs"
-Rails.start()
+require("@rails/ujs").start()
 <%- unless options[:skip_turbolinks] -%>
-
-import Turbolinks from "turbolinks"
-Turbolinks.start()
+require("turbolinks").start()
 <%- end -%>
 <%- unless skip_active_storage? -%>
-
-import * as ActiveStorage from "@rails/activestorage"
-ActiveStorage.start()
+require("@rails/activestorage").start()
 <%- end -%>
 <%- unless options[:skip_action_cable] -%>
-
-import "channels"
+require("channels")
 <%- end -%>