Skip to content

Commit 9c8a3bb

Browse files
rsmithlalrsmithlal
authored
Merge pull request #556 from better-together-org/fixes/js-stability
Fixes/js stability
2 parents 1ab6866 + 5e2b8f0 commit 9c8a3bb

File tree

8 files changed

+210
-86
lines changed

8 files changed

+210
-86
lines changed

‎Gemfile.lock‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -39,72 +39,72 @@ PATH
3939
GEM
4040
remote: https://rubygems.org/
4141
specs:
42-
actioncable (7.0.8.3)
43-
actionpack (= 7.0.8.3)
44-
activesupport (= 7.0.8.3)
42+
actioncable (7.0.8.4)
43+
actionpack (= 7.0.8.4)
44+
activesupport (= 7.0.8.4)
4545
nio4r (~> 2.0)
4646
websocket-driver (>= 0.6.1)
47-
actionmailbox (7.0.8.3)
48-
actionpack (= 7.0.8.3)
49-
activejob (= 7.0.8.3)
50-
activerecord (= 7.0.8.3)
51-
activestorage (= 7.0.8.3)
52-
activesupport (= 7.0.8.3)
47+
actionmailbox (7.0.8.4)
48+
actionpack (= 7.0.8.4)
49+
activejob (= 7.0.8.4)
50+
activerecord (= 7.0.8.4)
51+
activestorage (= 7.0.8.4)
52+
activesupport (= 7.0.8.4)
5353
mail (>= 2.7.1)
5454
net-imap
5555
net-pop
5656
net-smtp
57-
actionmailer (7.0.8.3)
58-
actionpack (= 7.0.8.3)
59-
actionview (= 7.0.8.3)
60-
activejob (= 7.0.8.3)
61-
activesupport (= 7.0.8.3)
57+
actionmailer (7.0.8.4)
58+
actionpack (= 7.0.8.4)
59+
actionview (= 7.0.8.4)
60+
activejob (= 7.0.8.4)
61+
activesupport (= 7.0.8.4)
6262
mail (~> 2.5, >= 2.5.4)
6363
net-imap
6464
net-pop
6565
net-smtp
6666
rails-dom-testing (~> 2.0)
67-
actionpack (7.0.8.3)
68-
actionview (= 7.0.8.3)
69-
activesupport (= 7.0.8.3)
67+
actionpack (7.0.8.4)
68+
actionview (= 7.0.8.4)
69+
activesupport (= 7.0.8.4)
7070
rack (~> 2.0, >= 2.2.4)
7171
rack-test (>= 0.6.3)
7272
rails-dom-testing (~> 2.0)
7373
rails-html-sanitizer (~> 1.0, >= 1.2.0)
74-
actiontext (7.0.8.3)
75-
actionpack (= 7.0.8.3)
76-
activerecord (= 7.0.8.3)
77-
activestorage (= 7.0.8.3)
78-
activesupport (= 7.0.8.3)
74+
actiontext (7.0.8.4)
75+
actionpack (= 7.0.8.4)
76+
activerecord (= 7.0.8.4)
77+
activestorage (= 7.0.8.4)
78+
activesupport (= 7.0.8.4)
7979
globalid (>= 0.6.0)
8080
nokogiri (>= 1.8.5)
81-
actionview (7.0.8.3)
82-
activesupport (= 7.0.8.3)
81+
actionview (7.0.8.4)
82+
activesupport (= 7.0.8.4)
8383
builder (~> 3.1)
8484
erubi (~> 1.4)
8585
rails-dom-testing (~> 2.0)
8686
rails-html-sanitizer (~> 1.1, >= 1.2.0)
87-
activejob (7.0.8.3)
88-
activesupport (= 7.0.8.3)
87+
activejob (7.0.8.4)
88+
activesupport (= 7.0.8.4)
8989
globalid (>= 0.3.6)
90-
activemodel (7.0.8.3)
91-
activesupport (= 7.0.8.3)
92-
activerecord (7.0.8.3)
93-
activemodel (= 7.0.8.3)
94-
activesupport (= 7.0.8.3)
90+
activemodel (7.0.8.4)
91+
activesupport (= 7.0.8.4)
92+
activerecord (7.0.8.4)
93+
activemodel (= 7.0.8.4)
94+
activesupport (= 7.0.8.4)
9595
activerecord-import (1.7.0)
9696
activerecord (>= 4.2)
9797
activerecord-postgis-adapter (8.0.3)
9898
activerecord (~> 7.0.0)
9999
rgeo-activerecord (~> 7.0.0)
100-
activestorage (7.0.8.3)
101-
actionpack (= 7.0.8.3)
102-
activejob (= 7.0.8.3)
103-
activerecord (= 7.0.8.3)
104-
activesupport (= 7.0.8.3)
100+
activestorage (7.0.8.4)
101+
actionpack (= 7.0.8.4)
102+
activejob (= 7.0.8.4)
103+
activerecord (= 7.0.8.4)
104+
activesupport (= 7.0.8.4)
105105
marcel (~> 1.0)
106106
mini_mime (>= 1.1.0)
107-
activesupport (7.0.8.3)
107+
activesupport (7.0.8.4)
108108
concurrent-ruby (~> 1.0, >= 1.0.2)
109109
i18n (>= 1.6, < 2)
110110
minitest (>= 5.1)
@@ -128,13 +128,13 @@ GEM
128128
popper_js (>= 2.11.8, < 3)
129129
brakeman (6.1.2)
130130
racc
131-
builder (3.2.4)
131+
builder (3.3.0)
132132
bundler-audit (0.9.1)
133133
bundler (>= 1.2.0, < 3)
134134
thor (~> 1.0)
135135
byebug (11.1.3)
136136
coderay (1.1.3)
137-
concurrent-ruby (1.2.3)
137+
concurrent-ruby (1.3.2)
138138
coveralls (0.7.1)
139139
multi_json (~> 1.3)
140140
rest-client
@@ -253,7 +253,7 @@ GEM
253253
mobility (~> 1.2)
254254
msgpack (1.7.2)
255255
multi_json (1.15.0)
256-
net-imap (0.4.11)
256+
net-imap (0.4.12)
257257
date
258258
net-protocol
259259
net-pop (0.1.2)
@@ -290,30 +290,30 @@ GEM
290290
rack (>= 1.2.0)
291291
rack-test (2.1.0)
292292
rack (>= 1.3)
293-
rails (7.0.8.3)
294-
actioncable (= 7.0.8.3)
295-
actionmailbox (= 7.0.8.3)
296-
actionmailer (= 7.0.8.3)
297-
actionpack (= 7.0.8.3)
298-
actiontext (= 7.0.8.3)
299-
actionview (= 7.0.8.3)
300-
activejob (= 7.0.8.3)
301-
activemodel (= 7.0.8.3)
302-
activerecord (= 7.0.8.3)
303-
activestorage (= 7.0.8.3)
304-
activesupport (= 7.0.8.3)
293+
rails (7.0.8.4)
294+
actioncable (= 7.0.8.4)
295+
actionmailbox (= 7.0.8.4)
296+
actionmailer (= 7.0.8.4)
297+
actionpack (= 7.0.8.4)
298+
actiontext (= 7.0.8.4)
299+
actionview (= 7.0.8.4)
300+
activejob (= 7.0.8.4)
301+
activemodel (= 7.0.8.4)
302+
activerecord (= 7.0.8.4)
303+
activestorage (= 7.0.8.4)
304+
activesupport (= 7.0.8.4)
305305
bundler (>= 1.15.0)
306-
railties (= 7.0.8.3)
306+
railties (= 7.0.8.4)
307307
rails-dom-testing (2.2.0)
308308
activesupport (>= 5.0.0)
309309
minitest
310310
nokogiri (>= 1.6)
311311
rails-html-sanitizer (1.6.0)
312312
loofah (~> 2.21)
313313
nokogiri (~> 1.14)
314-
railties (7.0.8.3)
315-
actionpack (= 7.0.8.3)
316-
activesupport (= 7.0.8.3)
314+
railties (7.0.8.4)
315+
actionpack (= 7.0.8.4)
316+
activesupport (= 7.0.8.4)
317317
method_source
318318
rake (>= 12.2)
319319
thor (~> 1.0)

‎app/assets/config/better_together_manifest.js‎

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

33
//= link_tree ../../javascript/better_together .js
4+
// link_tree ../../../vendor/javascript .js
45
//= link_tree ../stylesheets/better_together .css
56
//= link_tree ../images/better_together
67

78
//= link bootstrap.min.js
89
//= link popper.js
910

11+
//= link stimulus.min.js
12+
//= link stimulus-loading.js
13+
//= link turbo.min.js

‎app/assets/images/better_together/helena-lopes-PGnqT0rXWLs-unsplash.jpg‎

4.63 MB
Loading

‎app/javascript/better_together/application.js‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,22 @@
1616
//= require better_together/tooltips
1717
// require_tree .
1818

19-
import '@hotwired/turbo-rails'
20-
import '@hotwired/stimulus'
21-
import '@hotwired/stimulus-loading'
19+
import { Turbo } from '@hotwired/turbo-rails'
20+
// import { Application } from '@hotwired/stimulus'
2221
// import 'trix'
23-
import '@rails/actiontext'
22+
// import { start as startActionText } from '@rails/actiontext'
2423

25-
import 'better_together/controllers'
24+
import { application } from 'better_together/controllers'
2625
// import 'better_together/trix-extensions/richtext'
2726

2827
// import 'bootstrap'
2928

3029
// Turbo.session.drive = false
3130

32-
console.log('initializing engine')
31+
// const application = Application.start()
32+
33+
console.log('initializing engine')
34+
35+
// window.Stimulus = application
36+
37+
export { application }

‎app/javascript/better_together/controllers/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import { application } from "better_together/controllers/application"
77
// eagerLoadControllersFrom("controllers", application)
88

99
// Lazy load controllers as they appear in the DOM (remember not to preload controllers in import map!)
10-
import { lazyLoadControllersFrom } from "@hotwired/stimulus-loading"
10+
import { lazyLoadControllersFrom } from 'stimulus-loading' // Adjust the path if necessary
1111
lazyLoadControllersFrom("controllers", application)
1212

1313
console.log('initializing engine controllers')
1414

15-
export { }
15+
export { application }

0 commit comments

Comments
 (0)