Merge from dev to main for v1.2.0

.gitignore

@@ -34,10 +34,14 @@
 # Ignore master key for decrypting credentials and more.
 /config/master.key
 
-/app/assets/builds/*
-!/app/assets/builds/.keep
+#/app/assets/builds/*
 
 # different for diff development machines
 config/credentials.yml.enc
 
 dump.rdb
+
+/node_modules
+
+/app/assets/builds/*
+!/app/assets/builds/.keep

Gemfile

@@ -4,19 +4,18 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby "3.1.2"
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-gem "rails", "~> 7.0.4"
+gem "rails", "~> 7.1.2"
 
 # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
-gem "sprockets-rails"
+#gem "sprockets-rails"
 
 # Use sqlite3 as the database for Active Record
 gem "sqlite3", "~> 1.4"
 
 # Use the Puma web server [https://github.com/puma/puma]
-gem "puma", "~> 5.0"
+gem "puma", "~> 6.0"
 
 # Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
-gem "importmap-rails"
 
 # Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
 gem "turbo-rails"
@@ -80,12 +79,9 @@ group :test do
   gem "webdrivers"
 end
 
-gem "jsbundling-rails", "~> 1.0"
 
 gem "dnsimple", "~> 8.1"
 
-gem "tailwindcss-rails", "~> 2.0"
-
 gem "dalli", "~> 3.2"
 
 gem "rails_nestable_layouts", path: "gems/rails_nestable_layouts"
@@ -104,3 +100,14 @@ gem 'pg'
 gem "sentry", "~> 0.5.3"
 
 gem "sentry-rails", "~> 5.13"
+
+gem "solid_cache", "~> 0.2.0"
+
+gem "importmap-rails", "~> 1.2"
+
+gem "tailwindcss-rails", "~> 2.1"
+
+gem "cssbundling-rails", "~> 1.3"
+
+
+gem "propshaft"