Shakapacker (#323)

* Migrate from Sprockets to Shakapacker * Refactor CoffeeScript * Travis config
jcraigk · Oct 5, 2023 · a9873f9 · a9873f9
1 parent 2e86995
commit a9873f9
Show file tree

Hide file tree

Showing 77 changed files with 4,709 additions and 639 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,9 @@
 /public/assets
 /public/audio
 /tmp
+/public/packs
+/public/packs-test
+/node_modules
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity
diff --git a/.travis.yml b/.travis.yml
@@ -29,8 +29,11 @@ before_install:
   - psql -c 'create database phishin_test;' -U postgres
   - gem update --system --no-document
   - gem install bundler --no-document
-install: bundle install
+install:
+  - bundle install
+  - yarn install
 script:
+  - bundle exec rails assets:precompile
   - bundle exec rubocop
   - bundle exec rspec
 after_script:

diff --git a/Gemfile b/Gemfile
@@ -4,35 +4,27 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '3.2.2'
 
 gem 'actionpack-action_caching'
-gem 'bootstrap-will_paginate'
 gem 'chunky_png'
-gem 'coffee-rails'
 gem 'dalli'
 gem 'devise'
-gem 'execjs', '2.7.0' # 2.8 breaks coffeescript compilation
 gem 'friendly_id'
 gem 'geocoder'
 gem 'google-api-client'
 gem 'highline'
-gem 'jquery-rails'
-gem 'jquery-ui-rails', '< 6.0' # 6.0 breaks slider/scrubber
 gem 'nokogiri'
 gem 'pg'
 gem 'pg_search'
 gem 'puma'
 gem 'rails'
 gem 'ruby-mp3info'
 gem 'ruby-progressbar'
-gem 'sass-rails'
 gem 'sentry-raven'
+gem 'shakapacker'
 gem 'shrine'
 gem 'slim'
-gem 'soundmanager2-rails'
-gem 'twitter-bootstrap-rails', '2.2.8'
 gem 'typhoeus'
-gem 'uglifier'
 gem 'waveformjson'
-gem 'will_paginate', '< 4' # 4.0 breaks bootstrap-will_paginate
+gem 'will_paginate'
 
 group :development do
   gem 'bullet'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -73,8 +73,6 @@ GEM
     ast (2.4.2)
     base64 (0.1.1)
     bcrypt (3.1.19)
-    bootstrap-will_paginate (1.0.0)
-      will_paginate
     builder (3.2.4)
     bullet (7.0.7)
       activesupport (>= 3.0.0)
@@ -95,13 +93,6 @@ GEM
       capybara (>= 1.0, < 4)
       launchy
     chunky_png (1.4.0)
-    coffee-rails (5.0.0)
-      coffee-script (>= 2.2.0)
-      railties (>= 5.2.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
     concurrent-ruby (1.2.2)
     content_disposition (1.0.0)
     crass (1.0.6)
@@ -124,7 +115,6 @@ GEM
     erubi (1.12.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    execjs (2.7.0)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
@@ -137,7 +127,7 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.16.2)
+    ffi (1.16.3)
     friendly_id (5.5.0)
       activerecord (>= 4.0.0)
     gems (1.2.0)
@@ -174,12 +164,6 @@ GEM
     httpclient (2.8.3)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jquery-rails (4.6.0)
-      rails-dom-testing (>= 1, < 3)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.5)
-      railties (>= 3.2.16)
     json (2.6.3)
     jwt (2.7.1)
     language_server-protocol (3.17.0.3)
@@ -199,7 +183,7 @@ GEM
     mini_mime (1.1.5)
     minitest (5.20.0)
     multi_json (1.15.0)
-    net-imap (0.3.7)
+    net-imap (0.4.0)
       date
       net-protocol
     net-pop (0.1.2)
@@ -216,7 +200,7 @@ GEM
     orm_adapter (0.5.0)
     os (1.1.4)
     parallel (1.23.0)
-    parser (3.2.2.3)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     pg (1.5.4)
@@ -228,6 +212,8 @@ GEM
       nio4r (~> 2.0)
     racc (1.7.1)
     rack (2.2.8)
+    rack-proxy (0.7.7)
+      rack
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (7.0.8)
@@ -308,7 +294,7 @@ GEM
     rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.21.1)
+    rubocop-rails (2.21.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -323,22 +309,18 @@ GEM
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    sass-rails (6.0.0)
-      sassc-rails (~> 2.1, >= 2.1.1)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sassc-rails (2.1.2)
-      railties (>= 4.0.0)
-      sassc (>= 2.0)
-      sprockets (> 3.0)
-      sprockets-rails
-      tilt
     selenium-webdriver (4.13.1)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
+    semantic_range (3.0.0)
     sentry-raven (3.1.2)
       faraday (>= 1.0)
+    shakapacker (7.1.0)
+      activesupport (>= 5.2)
+      rack-proxy (>= 0.6.1)
+      railties (>= 5.2)
+      semantic_range (>= 2.3.0)
     shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)
     shrine (3.5.0)
@@ -352,32 +334,17 @@ GEM
     slim (5.1.1)
       temple (~> 0.10.0)
       tilt (>= 2.1.0)
-    soundmanager2-rails (2.97.20170601)
-    sprockets (4.2.1)
-      concurrent-ruby (~> 1.0)
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.0)
-    temple (0.10.2)
+    temple (0.10.3)
     thor (1.2.2)
     tilt (2.3.0)
     timeout (0.4.0)
     trailblazer-option (0.1.2)
-    twitter-bootstrap-rails (2.2.8)
-      actionpack (>= 3.1)
-      execjs
-      rails (>= 3.1)
-      railties (>= 3.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    uglifier (4.2.0)
-      execjs (>= 0.3.0, < 3)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -388,7 +355,7 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    will_paginate (3.3.1)
+    will_paginate (4.0.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zeitwerk (2.6.12)
@@ -400,25 +367,20 @@ PLATFORMS
 
 DEPENDENCIES
   actionpack-action_caching
-  bootstrap-will_paginate
   bullet
   capybara
   capybara-email
   capybara-screenshot
   chunky_png
-  coffee-rails
   dalli
   devise
   dotenv-rails
-  execjs (= 2.7.0)
   factory_bot_rails
   faker
   friendly_id
   geocoder
   google-api-client
   highline
-  jquery-rails
-  jquery-ui-rails (< 6.0)
   nokogiri
   pg
   pg_search
@@ -433,18 +395,15 @@ DEPENDENCIES
   rubocop-rspec
   ruby-mp3info
   ruby-progressbar
-  sass-rails
   selenium-webdriver
   sentry-raven
+  shakapacker
   shoulda-matchers
   shrine
   slim
-  soundmanager2-rails
-  twitter-bootstrap-rails (= 2.2.8)
   typhoeus
-  uglifier
   waveformjson
-  will_paginate (< 4)
+  will_paginate
 
 RUBY VERSION
    ruby 3.2.2p53

diff --git a/app.json b/app.json
@@ -1,7 +1,7 @@
 {
   "scripts": {
     "dokku": {
-      "predeploy": "bundle exec rails db:migrate && bundle exec rake assets:precompile",
+      "predeploy": "bundle exec rails db:migrate && bundle exec rails assets:precompile",
       "postdeploy": "if [ -n \"$DISCORD_WEBHOOK_URL\" ]; then JSON_STRING=\"{\\\"content\\\":\\\"[$GIT_REV](https://github.com/jcraigk/phishin/commit/$GIT_REV) successfully deployed\\\"}\"; curl -X POST -H 'Content-Type: application/json' --data \"$JSON_STRING\" $DISCORD_WEBHOOK_URL; fi"
     }
   }

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -1,18 +1 @@
-//= link application.css
-//
-//= link application.js
-//
-//= link icon-context.png
-//= link icon-next.png
-//= link icon-previous.png
-//= link icon-relisten.png
-//= link icon-splendor.png
-//= link icon-search.png
-//= link icons-heart-small.png
-//= link icons-heart.png
-//= link icons-playlist.png
-//= link icons-playpause.png
-//= link icons-volume.png
-//= link logo.png
-//= link logo-og.png
-//= link logo-twitter-card.png
+{}
diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
diff --git a/app/controllers/playlists_controller.rb b/app/controllers/playlists_controller.rb
@@ -11,6 +11,7 @@ class PlaylistsController < ApplicationController
     shuffle: false
   }.freeze
 
+  skip_before_action :verify_authenticity_token
   before_action :init_session
   before_action :authenticate_user!, only: %i[save destroy bookmark unbookmark]
 

diff --git a/app/helpers/playlist_helper.rb b/app/helpers/playlist_helper.rb
@@ -1,9 +1,9 @@
 module PlaylistHelper
   def playlist_filter_hash
     {
-      '<i class="icon icon-globe"></i> All' => 'all',
-      '<i class="icon icon-user"></i> Only Mine' => 'mine',
-      '<i class="icon icon-bookmark"></i> Only Phriends\'' => 'phriends'
+      '<i class="glyphicon glyphicon-globe"></i> All' => 'all',
+      '<i class="glyphicon glyphicon-user"></i> Only Mine' => 'mine',
+      '<i class="glyphicon glyphicon-bookmark"></i> Only Phriends\'' => 'phriends'
     }
   end