From e910630ef018912d3ffc81ce3cc23e4d2201e5da Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 3 Jan 2023 12:27:54 +0100
Subject: [PATCH] Setup cssbundling-rails

---
 .gitignore             | 2 ++
 Gemfile                | 6 +++++-
 Gemfile.lock           | 9 +++++++--
 Procfile.dev           | 2 ++
 bin/dev                | 8 ++++++++
 package.json           | 6 ++++--
 public/assets/.gitkeep | 0
 yarn.lock              | 9 +++++++++
 8 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 Procfile.dev
 create mode 100644 bin/dev
 delete mode 100644 public/assets/.gitkeep

diff --git a/.gitignore b/.gitignore
index 039a6deb..90e50453 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,8 @@
 /tmp
 
 # precompiled assets/packs
+/app/assets/builds/*
+!/app/assets/builds/.keep
 /public/assets
 /public/packs
 /public/packs-test
diff --git a/Gemfile b/Gemfile
index e4e5d085..09d6581a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,9 +6,13 @@ gem "i18n-js", "4.0"
 gem "rails", "~> 6.1"
 gem "rails-i18n", "~> 7.0"
 
+gem "sprockets", "~> 4.1"
+gem "sprockets-rails", :require => "sprockets/railtie"
+gem "sassc-rails"
+gem "cssbundling-rails", "~> 1.1"
+
 gem "pg"
 
-gem "sassc-rails"
 gem "turbo-rails"
 
 gem "bcrypt", "~> 3.1.18"
diff --git a/Gemfile.lock b/Gemfile.lock
index db901422..d38a389c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -108,6 +108,8 @@ GEM
     concurrent-ruby (1.1.10)
     connection_pool (2.2.5)
     crass (1.0.6)
+    cssbundling-rails (1.1.2)
+      railties (>= 6.0.0)
     database_cleaner (2.0.1)
       database_cleaner-active_record (~> 2.0.0)
     database_cleaner-active_record (2.0.1)
@@ -474,9 +476,9 @@ GEM
       simplecov
     simplecov_json_formatter (0.1.4)
     spring (4.1.0)
-    sprockets (3.7.2)
+    sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
@@ -544,6 +546,7 @@ DEPENDENCIES
   carrierwave (~> 2.0)
   carrierwave_backgrounder!
   colorize
+  cssbundling-rails (~> 1.1)
   database_cleaner
   devise (~> 4.0)
   devise-async
@@ -607,6 +610,8 @@ DEPENDENCIES
   simplecov-cobertura
   simplecov-json
   spring (~> 4.1)
+  sprockets (~> 4.1)
+  sprockets-rails
   tldv (~> 0.1.0)
   turbo-rails
   twitter
diff --git a/Procfile.dev b/Procfile.dev
new file mode 100644
index 00000000..cb7c9aa8
--- /dev/null
+++ b/Procfile.dev
@@ -0,0 +1,2 @@
+web: unset PORT && bin/rails server
+css: yarn build:css --watch
diff --git a/bin/dev b/bin/dev
new file mode 100644
index 00000000..74ade166
--- /dev/null
+++ b/bin/dev
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+if ! gem list foreman -i --silent; then
+  echo "Installing foreman..."
+  gem install foreman
+fi
+
+exec foreman start -f Procfile.dev "$@"
diff --git a/package.json b/package.json
index 3dd8f287..2f792515 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,14 @@
 {
   "scripts": {
     "lint": "yarn run eslint --ext .ts app/javascript",
-    "lint:fix": "yarn run eslint --ext .ts app/javascript --fix"
+    "lint:fix": "yarn run eslint --ext .ts app/javascript --fix",
+    "build:css": "sass ./app/assets/stylesheets/application.sass.scss:./app/assets/builds/application.css --no-source-map --load-path=node_modules"
   },
   "dependencies": {
     "@babel/preset-typescript": "^7.18.6",
+    "@fontsource/lexend": "^4.5.13",
     "@hotwired/stimulus": "^3.2.1",
     "@hotwired/stimulus-webpack-helpers": "^1.0.1",
-    "@fontsource/lexend": "^4.5.13",
     "@hotwired/turbo-rails": "^7.2.4",
     "@melloware/coloris": "^0.16.1",
     "@rails/request.js": "^0.0.8",
@@ -22,6 +23,7 @@
     "popper.js": "^1.16.1",
     "rails_admin": "3.0.0",
     "regenerator-runtime": "^0.13.11",
+    "sass": "^1.57.1",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
     "typescript": "^4.9.4"
diff --git a/public/assets/.gitkeep b/public/assets/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/yarn.lock b/yarn.lock
index 1cfb6503..7d4df4ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6816,6 +6816,15 @@ sass@^1.38.0:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
+sass@^1.57.1:
+  version "1.57.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.57.1.tgz#dfafd46eb3ab94817145e8825208ecf7281119b5"
+  integrity sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==
+  dependencies:
+    chokidar ">=3.0.0 <4.0.0"
+    immutable "^4.0.0"
+    source-map-js ">=0.6.2 <2.0.0"
+
 sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"