Skip to content

Commit abdcb97

Browse files
committed
fix: update how stimulus js files are loaded
1 parent 426e414 commit abdcb97

File tree

4 files changed

+12
-17
lines changed

4 files changed

+12
-17
lines changed

app/assets/config/better_together_manifest.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// app/assets/config/better_together_manifest.js
22

3+
//= link_tree ../../javascript/better_together/controllers .js
34
//= link_tree ../../javascript/better_together .js
45
//= link_tree ../stylesheets/better_together .css
56
//= link_tree ../images/better_together
@@ -10,5 +11,3 @@
1011
//= link stimulus.min.js
1112
//= link stimulus-loading.js
1213
//= link turbo.min.js
13-
14-
//= link_directory ../../javascript/better_together/controllers .js

app/javascript/better_together/application.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
// require activestorage
1414
//= require popper
1515
//= require bootstrap-sprockets
16-
//= require better_together/controllers
16+
// require better_together/controllers
1717
//= require better_together/tooltips
1818

1919
import { Turbo } from '@hotwired/turbo-rails'
2020

21-
// import { application } from './better_together/controllers'
21+
import './better_together/controllers'
2222

2323
// import 'better_together/trix-extensions/richtext'
2424
// import 'trix'

app/javascript/better_together/controllers/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
//= require better_together/controllers/application
1+
// require better_together/controllers/application
22

3-
// import { application } from './controllers/application'
3+
import { application } from './controllers/application'
44

5-
// Eager load all controllers defined in the import map under controllers/**/*_controller
5+
// load all controllers defined in the import map under controllers/**/*_controller
66
import { lazyLoadControllersFrom } from 'stimulus-loading'
77
lazyLoadControllersFrom('./better_together/controllers', application)
88

config/importmap.rb

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@
22

33
# config/importmap.rb
44

5-
# pin_all_from File.expand_path('../app/javascript/better_together', __dir__)
6-
# pin_all_from 'app/javascript/better_together/controllers', under: 'controllers'
7-
pin_all_from 'app/javascript/better_together/controllers', under: 'better_together/controllers', to: 'controllers'
8-
# pin_all_from 'app/javascript/better_together/trix-extensions', under: 'trix-extensions', to: 'trix-extensions'
9-
10-
pin '@hotwired/turbo-rails', to: 'turbo.min.js'
11-
pin '@hotwired/stimulus', to: 'stimulus.min.js'
12-
pin 'stimulus-loading', to: 'stimulus-loading.js', preload: true # Ensure correct path and file extension
13-
5+
pin "application", preload: true
146
pin 'bootstrap', to: 'bootstrap.min.js', preload: true
15-
pin '@popperjs/core', to: 'popper.js', preload: true
7+
pin 'stimulus-loading', to: 'stimulus-loading.js', preload: true
168
pin 'trix', preload: true
9+
pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
10+
pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
11+
pin '@popperjs/core', to: 'popper.js', preload: true
1712
pin '@rails/actiontext', to: 'actiontext.js', preload: true
13+
pin_all_from "app/javascript/controllers", under: "controllers"

0 commit comments

Comments
 (0)