Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore Mac system files
.DS_Store

# Ignore vscode config
.vscode

Expand Down Expand Up @@ -54,6 +57,5 @@ tags
.npmrc

# Ignore local configuration files
.env
.env*.local
.env*
!.env.development
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

- Migrated from deprecated `sass-rails` gem to `dartsass-sprockets` (Dart Sass)
for long-term CSS compilation support
[#158](https://github.com/epimorphics/lr-landing/issues/158)
- Removed `bootstrap-sass` in favour of Bootstrap framework dependencies for
enhanced styling capabilities and maintainability
- Updated asset pipeline configuration and loading order for improved
performance
- Enabled Autoprefixer source maps for better CSS debugging in development
- Streamlined Rails framework loading configuration
- Updated Sass configuration for compatibility with new build toolchain

## [2.2.4] - 2025-11

### Added
Expand Down
46 changes: 27 additions & 19 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,52 +4,60 @@ source 'https://rubygems.org'

gem 'rails'

# Use SCSS for stylesheets
gem 'sass-rails'
# Use Uglifier as compressor for JavaScript assets
# gem 'uglifier'
gem 'terser' # Updating to terser for ES6+ support
# Use Puma as the app server
gem 'puma'


# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder'
# Use jquery as the JavaScript library
gem 'jquery-rails'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'get_process_mem'
# JavaScript asset compressor
gem 'terser' # Updating to terser for ES6+ support

# Use SCSS for stylesheets, used mainly in development and test groups
gem 'autoprefixer-rails'
gem 'dartsass-sprockets', '~> 3.2'

gem 'haml-rails'

gem 'get_process_mem'
gem 'http_accept_language'
gem 'jbuilder'
gem 'prometheus-client'
gem 'puma'
gem 'puma-metrics'
gem 'sentry-rails'

# Sentry uses stackprof for performance profiling, has to be loaded before Sentry
gem 'stackprof'
gem 'sentry-rails' # rubocop:disable Bundler/OrderedGems

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
gem 'dotenv'
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'rubocop'
gem 'rubocop-rails'
end

group :development do
gem 'derailed_benchmarks'
gem 'ruby-lsp'
gem 'solargraph'
gem 'derailed_benchmarks'
gem 'stackprof'
# Devtools panel for Rails development - loading from the GitHub repo
# (https://github.com/dejan/rails_panel/issues/209#issuecomment-2621877079_)
gem 'meta_request', github: 'dejan/rails_panel', ref: 'meta_request-v0.8.5'

# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console'

# NOTE: While running the rails app locally for testing you can set gems to your local path
# ! These "local" paths do not work with a docker image - use the repo instead
# gem 'json_rails_logger', path: '~/Epimorphics/shared/json-rails-logger'
# gem 'lr_common_styles', path: '~/Epimorphics/clients/land-registry/projects/lr_common_styles'
# gem 'qonsole_rails', path: '~/Epimorphics/clients/land-registry/projects/qonsole-rails'
end

source 'https://rubygems.pkg.github.com/epimorphics' do
gem 'json_rails_logger'
gem 'lr_common_styles'
gem 'qonsole_rails'
end

# TODO: While running the rails app locally for testing you can set gems to your local path
# ! These "local" paths do not work with a docker image - use the repo instead
# gem 'json_rails_logger', path: '~/Epimorphics/shared/json-rails-logger'
# gem 'lr_common_styles', path: '~/Epimorphics/clients/land-registry/projects/lr_common_styles'
# gem 'qonsole_rails', path: '~/Epimorphics/clients/land-registry/projects/qonsole-rails'
77 changes: 62 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,19 @@ GEM
benchmark-ips (2.14.0)
bigdecimal (3.3.1)
bindex (0.8.1)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
bootstrap (5.3.5)
popper_js (>= 2.11.8, < 3)
builder (3.3.0)
byebug (12.0.0)
concurrent-ruby (1.3.5)
connection_pool (2.5.4)
crass (1.0.6)
dartsass-sprockets (3.2.1)
railties (>= 4.0.0)
sassc-embedded (~> 1.80.1)
sprockets (> 3.0)
sprockets-rails
tilt
date (3.5.0)
derailed_benchmarks (2.2.1)
base64
Expand All @@ -121,21 +126,22 @@ GEM
ruby2_keywords
thor (>= 0.19, < 2)
diff-lcs (1.6.2)
dotenv (3.2.0)
drb (2.2.3)
erb (5.1.3)
erubi (1.13.1)
execjs (2.10.0)
faraday (2.13.4)
faraday (2.14.0)
faraday-net_http (>= 2.0, < 3.5)
json
logger
faraday-encoding (0.0.6)
faraday
faraday-follow_redirects (0.3.0)
faraday-follow_redirects (0.5.0)
faraday (>= 1, < 3)
faraday-net_http (3.4.1)
net-http (>= 0.5.0)
faraday-retry (2.3.2)
faraday-net_http (3.4.2)
net-http (~> 0.5)
faraday-retry (2.4.0)
faraday (~> 2.0)
ffi (1.17.2-aarch64-linux-gnu)
ffi (1.17.2-aarch64-linux-musl)
Expand All @@ -152,6 +158,27 @@ GEM
ffi (~> 1.0)
globalid (1.3.0)
activesupport (>= 6.1)
google-protobuf (4.33.2)
bigdecimal
rake (>= 13)
google-protobuf (4.33.2-aarch64-linux-gnu)
bigdecimal
rake (>= 13)
google-protobuf (4.33.2-aarch64-linux-musl)
bigdecimal
rake (>= 13)
google-protobuf (4.33.2-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.33.2-x86_64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.33.2-x86_64-linux-gnu)
bigdecimal
rake (>= 13)
google-protobuf (4.33.2-x86_64-linux-musl)
bigdecimal
rake (>= 13)
govuk_elements_rails (3.0.2)
govuk_frontend_toolkit (>= 5.2.0)
rails (>= 4.1.0)
Expand Down Expand Up @@ -225,8 +252,8 @@ GEM
modulejs-rails (2.2.0.0)
railties (>= 4.0)
mutex_m (0.3.0)
net-http (0.6.0)
uri
net-http (0.9.1)
uri (>= 0.11.1)
net-imap (0.5.12)
date
net-protocol
Expand Down Expand Up @@ -259,6 +286,7 @@ GEM
parser (3.3.9.0)
ast (~> 2.4.1)
racc
popper_js (2.11.8)
pp (0.6.3)
prettyprint
prettyprint (0.2.0)
Expand Down Expand Up @@ -362,13 +390,31 @@ GEM
ruby2_keywords (0.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-embedded (1.97.1-aarch64-linux-gnu)
google-protobuf (~> 4.31)
sass-embedded (1.97.1-aarch64-linux-musl)
google-protobuf (~> 4.31)
sass-embedded (1.97.1-arm-linux-gnueabihf)
google-protobuf (~> 4.31)
sass-embedded (1.97.1-arm-linux-musleabihf)
google-protobuf (~> 4.31)
sass-embedded (1.97.1-arm64-darwin)
google-protobuf (~> 4.31)
sass-embedded (1.97.1-x86_64-darwin)
google-protobuf (~> 4.31)
sass-embedded (1.97.1-x86_64-linux-gnu)
google-protobuf (~> 4.31)
sass-embedded (1.97.1-x86_64-linux-musl)
google-protobuf (~> 4.31)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.4.0)
ffi (~> 1.9)
sassc-embedded (1.80.8)
sass-embedded (~> 1.80)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
Expand Down Expand Up @@ -447,8 +493,8 @@ GEM
json
lograge
railties
lr_common_styles (2.3.1)
bootstrap-sass (~> 3.4.1)
lr_common_styles (3.0.0)
bootstrap (~> 5.3.2)
font-awesome-rails (~> 4.7.0)
govuk_elements_rails (= 3.0.2)
govuk_frontend_toolkit (~> 9.0)
Expand All @@ -459,8 +505,7 @@ GEM
modernizr-rails (~> 2.7)
modulejs-rails (~> 2.2.0)
rails (~> 8.0)
sass-rails (~> 6.0)
qonsole_rails (2.3.0)
qonsole_rails (2.4.0)
faraday (~> 2.13)
faraday-encoding (~> 0.0, >= 0.0.6)
faraday-follow_redirects (~> 0.3, >= 0.3.0)
Expand All @@ -484,8 +529,11 @@ PLATFORMS
x86_64-linux-musl

DEPENDENCIES
autoprefixer-rails
byebug
dartsass-sprockets (~> 3.2)
derailed_benchmarks
dotenv
get_process_mem
haml-rails
http_accept_language
Expand All @@ -502,7 +550,6 @@ DEPENDENCIES
rubocop
rubocop-rails
ruby-lsp
sass-rails
sentry-rails
solargraph
stackprof
Expand Down
Loading