Merge pull request #822 from amatsuda/propshaft

amatsuda · web-flow · commit b9a16ec1ccb7 · 2025-12-10T02:23:16.000+09:00
sprockets-rails out, propshaft in
diff --git a/.gitignore b/.gitignore
@@ -258,3 +258,6 @@ yarn-debug.log*
 /config/credentials/development.key
 
 /config/credentials/test.key
+
+/app/assets/builds/*
+!/app/assets/builds/.keep
diff --git a/Gemfile b/Gemfile
@@ -13,7 +13,8 @@ gem 'mime-types'
 gem 'rexml'
 gem 'matrix'
 
-gem 'sprockets-rails'
+gem 'propshaft'
+gem 'cssbundling-rails'
 gem 'shakapacker', '~> 6.6'
 
 gem 'honeybadger', '~> 6.1'
@@ -23,7 +24,6 @@ gem 'csv'
 gem 'pg'
 
 gem 'haml'
-gem 'uglifier', '>= 1.3.0'
 
 gem 'devise', '~> 4.9'
 gem 'omniauth-github'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -140,6 +140,8 @@ GEM
     country_select (11.0.0)
       countries (> 6.0, < 9.0)
     crass (1.0.6)
+    cssbundling-rails (1.4.3)
+      railties (>= 6.0.0)
     csv (3.3.5)
     date (3.5.0)
     debug (1.11.0)
@@ -171,7 +173,6 @@ GEM
     ethon (0.18.0)
       ffi (>= 1.15.0)
       logger
-    execjs (2.10.0)
     factory_bot (6.5.5)
       activesupport (>= 6.1.0)
     factory_bot_rails (6.5.1)
@@ -306,6 +307,10 @@ GEM
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
+    propshaft (1.3.1)
+      actionpack (>= 7.0.0)
+      activesupport (>= 7.0.0)
+      rack
     psych (5.2.6)
       date
       stringio
@@ -433,13 +438,6 @@ GEM
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
-    sprockets (4.2.1)
-      concurrent-ruby (~> 1.0)
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.5.2)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      sprockets (>= 3.0.0)
     stringio (3.1.9)
     temple (0.10.4)
     thor (1.4.0)
@@ -453,8 +451,6 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    uglifier (4.2.1)
-      execjs (>= 0.3.0, < 3)
     unaccent (0.4.0)
     uri (1.1.1)
     useragent (0.16.11)
@@ -483,6 +479,7 @@ DEPENDENCIES
   capybara (~> 3.37)
   chartkick
   country_select (~> 11.0)
+  cssbundling-rails
   csv
   debug
   devise (~> 4.9)
@@ -509,6 +506,7 @@ DEPENDENCIES
   omniauth-twitter
   paper_trail
   pg
+  propshaft
   puma
   pundit
   rack-mini-profiler
@@ -523,9 +521,7 @@ DEPENDENCIES
   shakapacker (~> 6.6)
   sidekiq
   simple_form
-  sprockets-rails
   turbo-rails
-  uglifier (>= 1.3.0)
 
 RUBY VERSION
    ruby 3.4.7p58
diff --git a/Procfile.dev b/Procfile.dev
@@ -0,0 +1,2 @@
+web: env RUBY_DEBUG_OPEN=true bin/rails server
+css: yarn build:css --watch
diff --git a/app/assets/builds/.keep b/app/assets/builds/.keep
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -1,3 +1,3 @@
 //= link_tree ../images
 //= link_directory ../javascripts .js
-//= link_directory ../stylesheets .css
+//= link_tree ../builds
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
diff --git a/app/assets/stylesheets/application.postcss.css b/app/assets/stylesheets/application.postcss.css
@@ -0,0 +1,45 @@
+/* Entry point for your PostCSS build */
+
+@import "bootstrap/dist/css/bootstrap.css";
+@import "tributejs/dist/tribute.css";
+@import "datatables.net-bs5/css/dataTables.bootstrap5.css";
+@import "tom-select/dist/css/tom-select.bootstrap5.css";
+
+@import "./base/css-colors.css";
+@import "./base/bootstrap-overrides.css";
+@import "./base/base.css";
+@import "./base/layout.css";
+@import "./base/helper_classes.css";
+@import "./base/typography.css";
+
+@import "./modules/badge.css";
+@import "./modules/buttons.css";
+@import "./modules/calendar.css";
+@import "./modules/code-mirror.css";
+@import "./modules/dashboard.css";
+@import "./modules/data_tables.css";
+@import "./modules/discussions.css";
+@import "./modules/events.css";
+@import "./modules/forms.css";
+@import "./modules/icons.css";
+@import "./modules/labels.css";
+@import "./modules/navbar.css";
+@import "./modules/markdown.css";
+@import "./modules/news.css";
+@import "./modules/notification.css";
+@import "./modules/event-teammate-invitations.css";
+@import "./modules/program-session.css";
+@import "./modules/proposal.css";
+@import "./modules/profile.css";
+@import "./modules/ratings.css";
+@import "./modules/schedule.css";
+@import "./modules/selection.css";
+@import "./modules/time-slot.css";
+@import "./modules/social-buttons.css";
+@import "./modules/shortcuts.css";
+@import "./modules/speaker.css";
+@import "./modules/stats.css";
+@import "./modules/tooltips.css";
+@import "./modules/widgets.css";
+@import "./modules/teammates.css";
+@import "./modules/staff-website-page.css";
diff --git a/app/assets/stylesheets/base/base.css b/app/assets/stylesheets/base/base.css
@@ -49,7 +49,7 @@ h3.tags {
   }
 }
 
-//datepicker
+/* datepicker */
 .ui-datepicker {
   z-index: 10000 !important;
 }
diff --git a/app/assets/stylesheets/modules/calendar.css b/app/assets/stylesheets/modules/calendar.css
@@ -1 +1 @@
-//Add Calendar Styles here
+/* Add Calendar Styles here */
diff --git a/app/assets/stylesheets/modules/data_tables.css b/app/assets/stylesheets/modules/data_tables.css
@@ -1,5 +1,5 @@
 /* Consider breaking the following into modules */
-//datatables
+/* datatables */
 table.datatable {
   thead {
     > tr {
diff --git a/app/assets/stylesheets/themes/default/footer.css b/app/assets/stylesheets/themes/default/footer.css
@@ -87,13 +87,13 @@ footer {
           }
         }
         .twitter-link {
-          background: url('<%= asset_path('themes/default/twitter-icon.svg') %>') center center no-repeat;
+          background: url('themes/default/twitter-icon.svg') center center no-repeat;
         }
         .facebook-link {
-          background: url('<%= asset_path('themes/default/fb-icon.svg') %>') center center no-repeat;
+          background: url('themes/default/fb-icon.svg') center center no-repeat;
         }
         .instagram-link {
-          background: url('<%= asset_path('themes/default/instagram-icon.svg') %>') center center no-repeat;
+          background: url('themes/default/instagram-icon.svg') center center no-repeat;
         }
       }
     }
diff --git a/app/assets/stylesheets/themes/default/nav.css b/app/assets/stylesheets/themes/default/nav.css
@@ -72,10 +72,10 @@
           height: 64px;
           position: absolute;
           right: 0;
-          background: url('<%= asset_path('themes/default/menu.svg') %>') center center no-repeat;
+          background: url('themes/default/menu.svg') center center no-repeat;
           transition: none;
           &.menu-toggle--opened {
-            background: url('<%= asset_path('themes/default/menu-close.svg') %>') center center no-repeat;
+            background: url('themes/default/menu-close.svg') center center no-repeat;
           }
         }
       }
diff --git a/app/assets/stylesheets/themes/default/schedule.css b/app/assets/stylesheets/themes/default/schedule.css
@@ -227,10 +227,10 @@
           .sponsor-tier-star {
             margin-right: 3px;
             display: inline-block;
-            -webkit-mask-image: url('<%= asset_path('themes/default/sponsor-tier.svg') %>');
+            -webkit-mask-image: url('themes/default/sponsor-tier.svg');
             -webkit-mask-repeat: no-repeat;
             -webkit-mask-size: 15px 15px;
-            mask-image: url('<%= asset_path('themes/default/sponsor-tier.svg') %>');
+            mask-image: url('themes/default/sponsor-tier.svg');
             mask-repeat: no-repeat;
             mask-size: 15px 15px;
             height: 15px;
@@ -278,7 +278,7 @@
             &::after {
               content: "";
               margin-left: 9px;
-              background-image: url('<%= asset_path('themes/default/arrow-white.png') %>');
+              background-image: url('themes/default/arrow-white.png');
               display: inline-block;
               height: 15px;
               width: 15px;
diff --git a/app/assets/stylesheets/themes/default/shared.css b/app/assets/stylesheets/themes/default/shared.css
@@ -80,7 +80,7 @@
     content: "";
     margin-right: 5px;
     display: inline-block;
-    background-image: url('<%= asset_path('themes/default/sponsor-star.png') %>');
+    background-image: url('themes/default/sponsor-star.png');
     height: 16px;
     width: 16px;
   }
diff --git a/bin/dev b/bin/dev
@@ -1,2 +1,11 @@
-#!/usr/bin/env ruby
-exec "./bin/rails", "server", *ARGV
+#!/usr/bin/env sh
+
+if gem list --no-installed --exact --silent foreman; then
+  echo "Installing foreman..."
+  gem install foreman
+fi
+
+# Default to port 3000 if not specified
+export PORT="${PORT:-3000}"
+
+exec foreman start -f Procfile.dev --env /dev/null "$@"
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -1,17 +1,4 @@
 # Be sure to restart your server when you modify this file.
 
-# Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = "1.0"
-
-# Add additional assets to the asset load path.
-# Rails.application.config.assets.paths << Emoji.images_path
-# Add Yarn node_modules folder to the asset load path.
-Rails.application.config.assets.paths << Rails.root.join('node_modules')
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in the app/assets
-# folder are already added.
-# Rails.application.config.assets.precompile += %w( admin.js admin.css )
-
 # Add node_modules folder to the asset load path.
 Rails.application.config.assets.paths << Rails.root.join("node_modules")
diff --git a/package.json b/package.json
@@ -1,6 +1,9 @@
 {
   "name": "app",
   "private": true,
+  "scripts": {
+    "build:css": "postcss ./app/assets/stylesheets/application.postcss.css -o ./app/assets/builds/application.css"
+  },
   "dependencies": {
     "@hotwired/turbo-rails": "^8.0.20",
     "@popperjs/core": "^2.11.8",
@@ -25,6 +28,9 @@
     "moment": "^2.30.1",
     "node-forge": "^1.3.0",
     "postcss": "^8.2.10",
+    "postcss-cli": "^11.0.1",
+    "postcss-import": "^16.1.1",
+    "postcss-nesting": "^13.0.2",
     "prop-types": "^15.7.2",
     "shakapacker": "6",
     "stimulus": "^3.0.1",
diff --git a/postcss.config.js b/postcss.config.js
@@ -1,13 +1,7 @@
 module.exports = {
   plugins: [
-    require('@tailwindcss/postcss'),
     require('postcss-import'),
-    require('postcss-flexbugs-fixes'),
-    require('postcss-preset-env')({
-      autoprefixer: {
-        flexbox: 'no-2009'
-      },
-      stage: 3
-    })
-  ]
+    require('postcss-nesting'),
+    require('autoprefixer'),
+  ],
 }
diff --git a/spec/system/website/schedule_spec.rb b/spec/system/website/schedule_spec.rb
@@ -23,8 +23,6 @@
   end
 
   scenario "the schedule page display sponsor information for time slots with sponsors", js: true do
-    pending 'Not passing'
-
     sponsor = create(:sponsor)
     time_slot = create(:time_slot, event: event)
 
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+web: env RUBY_DEBUG_OPEN=true bin/rails server`
	`2`	`+css: yarn build:css --watch`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ h3.tags {`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`		`-//datepicker`
	`52`	`+/* datepicker */`
`53`	`53`	`.ui-datepicker {`
`54`	`54`	`z-index: 10000 !important;`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-//Add Calendar Styles here`
	`1`	`+/* Add Calendar Styles here */`