Restore the Blacklight logo for generated apps

.github/workflows/ruby.yml

@@ -20,25 +20,24 @@ jobs:
         include:
           - rails_version: "~> 7.2"
             ruby: "3.3"
-            blacklight_version: "~> 7.34"
-            bootstrap_version: ~> 5.0
+            blacklight_version: "~> 7.38"
+            bootstrap_version: "~> 5.0"
             additional_name: Bootstrap 5
           - rails_version: "7.1.4"
             ruby: "3.2"
-            blacklight_version: "~> 7.34"
-            bootstrap_version: ~> 4.0
+            blacklight_version: "~> 7.38"
+            bootstrap_version: "~> 4.0"
             additional_name: Rails 7.1
           - rails_version: "~> 7.2"
             ruby: "3.3"
             blacklight_version: "~> 8.0"
-            bootstrap_version: ~> 4.0
+            bootstrap_version: "~> 4.0"
             additional_name: Blacklight 8
-            additional_engine_cart_rails_options: "-j rollup -a sprockets"
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
       BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
       BOOTSTRAP_VERSION: ${{ matrix.bootstrap_version }}
-      ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-coffee --skip-test ${{ matrix.additional_engine_cart_rails_options }}"
+      ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-coffee --skip-test -a propshaft ${{ matrix.additional_engine_cart_rails_options }}"
     steps:
       - uses: actions/checkout@v4
       # Remove these Chrome steps after https://issues.chromium.org/issues/351858989 is fixed

Dockerfile

@@ -45,7 +45,7 @@ RUN bundle install --jobs "$(nproc)"
 RUN mkdir -p /spotlight/app
 WORKDIR /spotlight/app
 
-RUN SKIP_TRANSLATION=yes rails _${RAILS_VERSION}_ new . -j webpack --force --template=../engine/template.rb
+RUN SKIP_TRANSLATION=yes rails _${RAILS_VERSION}_ new . -a propshaft --force --template=../engine/template.rb
 RUN bundle add pg
 RUN yarn add @babel/plugin-proposal-private-methods --dev
 RUN yarn add @babel/plugin-proposal-private-property-in-object

Gemfile

@@ -23,7 +23,7 @@ else
   if ENV['RAILS_VERSION']
     if ENV['RAILS_VERSION'] == 'edge'
       gem 'rails', github: 'rails/rails'
-      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
+      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks -a propshaft'
     else
       gem 'rails', ENV['RAILS_VERSION']
     end

README.md

@@ -19,7 +19,7 @@ Read more about what Spotlight is, our motivations for creating it, and how to i
 To bootstrap a new Rails application:
 
 ```
-$ SKIP_TRANSLATION=1 rails new app-name -m https://raw.githubusercontent.com/projectblacklight/spotlight/main/template.rb
+$ SKIP_TRANSLATION=1 rails new app-name -m https://raw.githubusercontent.com/projectblacklight/spotlight/main/template.rb -a propshaft
 ```
 
 or from an existing Rails application:

Rakefile

@@ -30,6 +30,9 @@ require 'engine_cart/rake_task'
 
 require 'spotlight/version'
 
+# Ensure the app generates with Propshaft; sprockets is no longer supported
+ENV['ENGINE_CART_RAILS_OPTIONS'] = "#{ENV.fetch('ENGINE_CART_RAILS_OPTIONS', nil)} -a propshaft"
+
 task ci: ['engine_cart:generate'] do
   ENV['environment'] = 'test'
 
@@ -63,7 +66,7 @@ namespace :spotlight do
             system 'bin/rails spotlight:initialize spotlight_test:solr:seed'
             File.open('.initialized', 'w') {}
           end
-          system 'bin/rails s'
+          system 'bin/dev'
         end
       end
     end