Skip to content

Commit 8272979

Browse files
committed
Correctly map local js imports
1 parent 68c5f4b commit 8272979

File tree

4 files changed

+10
-13
lines changed

4 files changed

+10
-13
lines changed

app/assets/config/better_together_manifest.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
// app/assets/config/better_together_manifest.js
22

3-
//= link_tree ../../javascript/better_together .js
4-
//= link_tree ../../javascript/better_together/controllers .js
5-
//= link_tree ../stylesheets/better_together .css
6-
//= link_tree ../stylesheets/better_together .scss
7-
//= link_tree ../images/better_together
3+
//= link_tree ../../javascript .js
4+
//= link_tree ../stylesheets .css
5+
//= link_tree ../stylesheets .scss
6+
//= link_tree ../images
87

98
//= link actioncable.js
109
//= link activestorage.js

app/javascript/better_together/application.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ import { Turbo } from '@hotwired/turbo-rails'
1818
import 'trix'
1919
import '@rails/actiontext'
2020

21-
import './better_together/controllers.js'
22-
import './better_together/tooltips.js'
23-
24-
import './better_together/trix-extensions/richtext.js'
21+
import 'better_together/controllers'
22+
import 'better_together/tooltips'
23+
import 'better_together/trix-extensions/richtext'
2524

2625
// Turbo.session.drive = false
2726

app/javascript/better_together/controllers/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// require better_together/controllers/application
22

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

55
// load all controllers defined in the import map under controllers/**/*_controller
66
import { lazyLoadControllersFrom } from 'stimulus-loading'

config/importmap.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
# config/importmap.rb
44

5+
pin_all_from File.expand_path('../app/javascript', __dir__)
6+
57
pin '@hotwired/turbo-rails', to: 'turbo.js', preload: true
68
pin '@hotwired/stimulus', to: 'stimulus.js', preload: true
79
pin '@popperjs/core', to: 'popper.js', preload: true
@@ -14,6 +16,3 @@
1416
pin 'es-module-shims', to: 'https://ga.jspm.io/npm:[email protected]/dist/es-module-shims.js', preload: true
1517
pin 'stimulus-loading', to: 'stimulus-loading.js', preload: true
1618
pin 'trix', to: 'https://unpkg.com/[email protected]/dist/trix.umd.min.js', preload: true
17-
18-
pin_all_from 'app/javascript/better_together/controllers', under: 'better_together/controllers'
19-
pin_all_from 'app/javascript/better_together/trix-extensions', under: 'better_together/trix-extensions'

0 commit comments

Comments
 (0)