Tweak dummy_app to allow running specs across all asset delivery methods

railsadminteam · Jun 14, 2022 · 425f2e3 · 425f2e3
1 parent de8c41a
commit 425f2e3
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 36 deletions.
diff --git a/spec/dummy_app/Gemfile b/spec/dummy_app/Gemfile
@@ -31,6 +31,7 @@ gem 'mlb', '>= 0.7', github: 'mshibuya/mlb', branch: 'ruby-3'
 gem 'paperclip', '>= 3.4'
 gem 'rails_admin', path: '../../'
 gem 'shrine', '~> 3.0'
+gem 'webpacker', require: false
 gem 'webrick', '~> 1.7'
 
 # Gems used only for assets and not required

diff --git a/spec/dummy_app/app/assets/config/manifest.js b/spec/dummy_app/app/assets/config/manifest.js
@@ -1,7 +1,4 @@
 //= link_tree ../images
-//= link_directory ../javascripts .js
-//= link_tree ../../javascript .js
-//= link_tree ../../../vendor/javascript .js
 //= link_tree ../../../../../src .js
-//= link_tree ../builds
+//= link application.js
 //= link application.css
diff --git a/spec/dummy_app/app/javascript/application.js b/spec/dummy_app/app/javascript/application.js
@@ -0,0 +1,4 @@
+import Rails from "@rails/ujs";
+import "@hotwired/turbo-rails";
+
+Rails.start();
diff --git a/spec/dummy_app/app/javascript/packs/application.js b/spec/dummy_app/app/javascript/packs/application.js
diff --git a/spec/dummy_app/app/javascript/packs/rails_admin.js b/spec/dummy_app/app/javascript/packs/rails_admin.js
diff --git a/...p/javascript/stylesheets/rails_admin.scss → ...dummy_app/app/javascript/rails_admin.scss b/...p/javascript/stylesheets/rails_admin.scss → ...dummy_app/app/javascript/rails_admin.scss
diff --git a/spec/dummy_app/app/views/layouts/application.html.erb b/spec/dummy_app/app/views/layouts/application.html.erb
@@ -2,8 +2,15 @@
 <html>
 <head>
   <title>DummyApp</title>
-  <%= stylesheet_link_tag    "application", media: "all" %>
-  <%= javascript_include_tag "application" %>
+  <% case CI_ASSET %>
+  <% when :webpacker %>
+    <%= javascript_pack_tag "application" %>
+  <% when :importmap %>
+    <%= javascript_importmap_tags %>
+  <% else %>
+    <%= stylesheet_link_tag    "application", media: "all" %>
+    <%= javascript_include_tag "application" %>
+  <% end %>
   <%= csrf_meta_tags %>
 </head>
 <body>

diff --git a/spec/dummy_app/config/application.rb b/spec/dummy_app/config/application.rb
@@ -18,7 +18,7 @@
 case CI_ASSET
 when :webpacker
   require 'webpacker'
-when :sprockets
+when :sprockets, :webpack
   require 'sprockets/railtie'
 when :importmap
   require 'sprockets/railtie'
@@ -42,11 +42,23 @@ class Application < Rails::Application
     config.active_record.time_zone_aware_types = %i[datetime time] if CI_ORM == :active_record
     config.active_storage.service = :local if defined?(ActiveStorage)
     config.active_storage.replace_on_assign_to_many = false if defined?(ActiveStorage) && ActiveStorage.version < Gem::Version.create('6.1')
-    config.importmap.cache_sweepers << RailsAdmin::Engine.root.join('src') if config.respond_to? :importmap
 
-    if CI_ASSET == :importmap
+    case CI_ASSET
+    when :webpack
+      config.assets.precompile += %w[rails_admin.js rails_admin.css]
+    when :importmap
       config.assets.paths << RailsAdmin::Engine.root.join('src')
+      config.assets.precompile += %w[rails_admin.js rails_admin.css]
       config.importmap.cache_sweepers << RailsAdmin::Engine.root.join('src')
     end
+
+    initializer :ignore_unused_assets_path, after: :append_assets_path, group: :all do |app|
+      case CI_ASSET
+      when :webpack, :importmap
+        app.config.assets.paths.delete(Rails.root.join('app', 'assets', 'javascripts').to_s)
+      when :sprockets
+        app.config.assets.paths.delete(Rails.root.join('app', 'assets', 'builds').to_s)
+      end
+    end
   end
 end
diff --git a/spec/dummy_app/config/importmap.rails_admin.rb b/spec/dummy_app/config/importmap.rails_admin.rb
@@ -5,12 +5,12 @@
 pin 'rails_admin', preload: true
 pin 'rails_admin/src/rails_admin/base', to: 'rails_admin/base.js'
 pin '@hotwired/turbo', to: 'https://ga.jspm.io/npm:@hotwired/turbo@7.1.0/dist/turbo.es2017-esm.js'
-pin '@hotwired/turbo-rails', to: 'https://ga.jspm.io/npm:@hotwired/turbo-rails@7.1.1/app/javascript/turbo/index.js'
-pin '@popperjs/core', to: 'https://ga.jspm.io/npm:@popperjs/core@2.11.2/dist/esm/popper.js'
+pin '@hotwired/turbo-rails', to: 'https://ga.jspm.io/npm:@hotwired/turbo-rails@7.1.3/app/javascript/turbo/index.js'
+pin '@popperjs/core', to: 'https://ga.jspm.io/npm:@popperjs/core@2.11.5/dist/esm/popper.js'
 pin '@rails/actioncable/src', to: 'https://ga.jspm.io/npm:@rails/actioncable@7.0.2/src/index.js'
 pin '@rails/ujs', to: 'https://ga.jspm.io/npm:@rails/ujs@6.1.4/lib/assets/compiled/rails-ujs.js'
 pin 'bootstrap', to: 'https://ga.jspm.io/npm:bootstrap@5.1.3/dist/js/bootstrap.esm.js'
-pin 'flatpickr', to: 'https://ga.jspm.io/npm:flatpickr@4.6.9/dist/flatpickr.js'
-pin 'flatpickr/', to: 'https://ga.jspm.io/npm:flatpickr@4.6.9/'
+pin 'flatpickr', to: 'https://ga.jspm.io/npm:flatpickr@4.6.13/dist/flatpickr.js'
+pin 'flatpickr/', to: 'https://ga.jspm.io/npm:flatpickr@4.6.13/'
 pin 'jquery', to: 'https://ga.jspm.io/npm:jquery@3.6.0/dist/jquery.js'
 pin 'jquery-ui/', to: 'https://ga.jspm.io/npm:jquery-ui@1.13.1/'
diff --git a/spec/dummy_app/config/importmap.rb b/spec/dummy_app/config/importmap.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# Pin npm packages by running ./bin/importmap
+
+pin 'application', preload: true
+pin '@hotwired/turbo-rails', to: 'https://ga.jspm.io/npm:@hotwired/turbo-rails@7.1.3/app/javascript/turbo/index.js'
+pin '@rails/ujs', to: 'https://ga.jspm.io/npm:@rails/ujs@6.0.5/lib/assets/compiled/rails-ujs.js'
+pin '@hotwired/turbo', to: 'https://ga.jspm.io/npm:@hotwired/turbo@7.1.0/dist/turbo.es2017-esm.js'
+pin '@rails/actioncable/src', to: 'https://ga.jspm.io/npm:@rails/actioncable@7.0.3/src/index.js'
diff --git a/spec/dummy_app/config/initializers/assets.rb b/spec/dummy_app/config/initializers/assets.rb
@@ -7,7 +7,7 @@
 
 # Add additional assets to the asset load path
 # Rails.application.config.assets.paths << Emoji.images_path
-Rails.application.config.assets.paths << Rails.root.join('node_modules/@fortawesome/fontawesome-free/webfonts')
+Rails.application.config.assets.paths << Rails.root.join('node_modules/@fortawesome/fontawesome-free/webfonts') if Rails.application.config.respond_to?(:assets)
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.

diff --git a/spec/dummy_app/config/webpacker.yml b/spec/dummy_app/config/webpacker.yml
@@ -2,7 +2,7 @@
 
 default: &default
   source_path: app/javascript
-  source_entry_path: packs
+  source_entry_path: .
   public_root_path: public
   public_output_path: packs
   cache_path: tmp/cache/webpacker
@@ -16,7 +16,7 @@ default: &default
   cache_manifest: false
 
   # Extract and emit a css file
-  extract_css: false
+  extract_css: true
 
   static_assets_extensions:
     - .jpg

diff --git a/spec/dummy_app/webpack.config.js b/spec/dummy_app/webpack.config.js
@@ -5,6 +5,7 @@ module.exports = {
   mode: "production",
   devtool: "source-map",
   entry: {
+    application: "./app/javascript/application.js",
     rails_admin: "./app/javascript/rails_admin.js",
   },
   output: {