Skip to content
This repository was archived by the owner on Oct 29, 2024. It is now read-only.

Commit a5c31e5

Browse files
committed
Move to webpacker. First steps: rails/ujs and turbolinks
1 parent b7ba3eb commit a5c31e5

File tree

6 files changed

+22
-10
lines changed

6 files changed

+22
-10
lines changed

Diff for: .yarnclean

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ docs
99
doc
1010
website
1111
images
12-
assets
1312

1413
# examples
1514
example

Diff for: app/assets/javascripts/application.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@
2121
//= require blueimp-file-upload/js/jquery.fileupload
2222
//= require blueimp-load-image/js/load-image
2323
//= require blueimp-tmpl/js/tmpl
24-
//= require rails-ujs
2524
//= require activestorage
26-
//= require turbolinks
2725
//= require punchbox
2826
//= require_tree .
2927

30-
new PiwikAnalytics();
28+
new PiwikAnalytics()
3129

3230
$(document).on('turbolinks:load', function() {
33-
new TooltipEnabler();
34-
new InfiniteScrolling();
35-
});
31+
new TooltipEnabler()
32+
new InfiniteScrolling()
33+
})

Diff for: app/javascript/packs/application.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@
77
// To reference this file, add <%= javascript_pack_tag 'application' %> to the appropriate
88
// layout file, like app/views/layouts/application.html.erb
99

10-
console.log('Hello World from Webpacker')
10+
import Rails from '@rails/ujs'
11+
import Turbolinks from 'turbolinks'
12+
Rails.start()
13+
Turbolinks.start()

Diff for: app/views/layouts/application.html.slim

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ html[lang="en"]
99
= csp_meta_tag
1010
= action_cable_meta_tag
1111
= piwik_meta_tags
12+
= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload'
1213
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload'
1314
= javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
14-
= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload'
1515

1616
body data-punchbox-controller=controller_path data-punchbox-action=action_name
1717
= render 'layouts/navbar'

Diff for: package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
"lint": "eslint --ext .js app/javascript"
66
},
77
"dependencies": {
8+
"@rails/ujs": "^6.0.0-alpha",
89
"@rails/webpacker": "^4.0.0-rc.7",
910
"CSSBox": "TheLastProject/CSSBox",
1011
"blueimp-file-upload": "^9.28.0",
1112
"coffeescript": "^2.3.1",
1213
"corejs-typeahead": "^1.2.1",
1314
"jquery": "^3.2.1",
14-
"parsleyjs": "^2.8.0"
15+
"parsleyjs": "^2.8.0",
16+
"turbolinks": "^5.2.0"
1517
},
1618
"devDependencies": {
1719
"babel-eslint": "^10.0.1",

Diff for: yarn.lock

+10
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,11 @@
648648
resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
649649
integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
650650

651+
"@rails/ujs@^6.0.0-alpha":
652+
version "6.0.0-alpha"
653+
resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.0-alpha.tgz#d5761d93e19215f5f342229f934d5ca8f6dd22a5"
654+
integrity sha512-6AZcab77PeJQv8RdfryDYh6tAGcndcRnqYaciLiFclADBPFE9Ip978pGCPiKcKGgCg8S1P1nZII+1GNIrUrx+g==
655+
651656
"@rails/webpacker@^4.0.0-rc.7":
652657
version "4.0.0-rc.7"
653658
resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-4.0.0-rc.7.tgz#da354003dd0a0e23d801b75c21aa1f3dc722f732"
@@ -7058,6 +7063,11 @@ tunnel-agent@^0.6.0:
70587063
dependencies:
70597064
safe-buffer "^5.0.1"
70607065

7066+
turbolinks@^5.2.0:
7067+
version "5.2.0"
7068+
resolved "https://registry.yarnpkg.com/turbolinks/-/turbolinks-5.2.0.tgz#e6877a55ea5c1cb3bb225f0a4ae303d6d32ff77c"
7069+
integrity sha512-pMiez3tyBo6uRHFNNZoYMmrES/IaGgMhQQM+VFF36keryjb5ms0XkVpmKHkfW/4Vy96qiGW3K9bz0tF5sK9bBw==
7070+
70617071
tweetnacl@^0.14.3, tweetnacl@~0.14.0:
70627072
version "0.14.5"
70637073
resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"

0 commit comments

Comments
 (0)