Merge branch 'main' into feature/def-analytics

.github/workflows/ci.yml

@@ -31,17 +31,17 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '16.14.0'
+          node-version: '18.18.2'
       - name: Setup yarn
         run: npm install -g yarn
       - name: Install Node packages
         run: yarn install
       - name: Install Ruby and gems
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.3
+          ruby-version: 3.1.4
           bundler-cache: true
       - name: Precompile assets
         run: bundle exec rails assets:precompile
@@ -60,7 +60,7 @@ jobs:
       - name: Install Ruby and gems
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.3
+          ruby-version: 3.1.4
           bundler-cache: true
       # Add or replace any other lints here
       - name: Security audit dependencies

.gitignore

@@ -41,3 +41,6 @@ bin/terrafile
 bin/konduit.sh
 bin/fetch_config.rb
 .byebug_history
+
+/app/assets/builds/*
+!/app/assets/builds/.keep

.ruby-version

@@ -1 +1 @@
-3.1.3
+3.1.4

.tool-versions

@@ -1,5 +1,5 @@
-nodejs 16.14.0
-ruby 3.1.3
+nodejs 18.18.2
+ruby 3.1.4
 yarn 1.22.18
 bundler 2.1.4
 tilt 0.33.5

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.1.3-alpine3.15
+FROM ruby:3.1.4-alpine
 
 ENV APP_HOME /app
 RUN mkdir $APP_HOME
@@ -17,9 +17,6 @@ RUN apk add --update --no-cache --virtual build-dependances \
     rm -rf /usr/local/bundle/cache && \
     apk del build-dependances
 
-# Remove once base image ruby:3.1.3-alpine3.15 has been updated with latest libraries
-RUN apk add --no-cache ncurses-libs=6.3_p20211120-r2
-
 COPY package.json yarn.lock ./
 RUN  yarn install --frozen-lockfile && \
      yarn cache clean
@@ -39,6 +36,7 @@ ARG GOVUK_NOTIFY_GENERIC_EMAIL_TEMPLATE_ID
 ENV GOVUK_NOTIFY_GENERIC_EMAIL_TEMPLATE_ID=$GOVUK_NOTIFY_GENERIC_EMAIL_TEMPLATE_ID
 
 RUN bundle exec rake assets:precompile && \
-    rm -rf node_modules tmp
+    rm -rf node_modules tmp && \
+    apk del yarn nodejs
 
 CMD ./bin/app-startup.sh

Gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.1.3"
+ruby "3.1.4"
 
 gem "bootsnap", require: false
 gem "foreman"
@@ -12,9 +12,7 @@ gem "okcomputer"
 gem "pg", "~> 1.5"
 gem "puma", "~> 6.4"
 gem "rails", "~> 7.0.8"
-gem "sprockets-rails"
 gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
-gem "webpacker"
 
 gem "pagy"
 gem "scenic"
@@ -33,7 +31,9 @@ gem "phonelib"
 ###############
 
 gem "audited", "~> 5.4"
-gem "config", "~> 4.2"
+gem "concurrent-ruby", require: "concurrent"
+gem "concurrent-ruby-ext"
+gem "config", "~> 5.0"
 gem "devise", "~> 4.9"
 gem "dfe-analytics", github: "DFE-Digital/dfe-analytics", tag: "v1.10.1"
 gem "flipper"
@@ -43,7 +43,7 @@ gem "httparty", "~> 0.21"
 gem "invisible_captcha"
 gem "omniauth-azure-activedirectory-v2"
 gem "rolify"
-gem "sentry-rails", "~> 5.11"
+gem "sentry-rails", "~> 5.12"
 
 group :test do
   gem "shoulda-matchers", "~> 5.0"
@@ -83,4 +83,10 @@ gem "sidekiq", "~> 6.5"
 
 gem "sidekiq-cron", "~> 1.10"
 
-gem "mail-notify", "~> 1.1"
+gem "mail-notify", "~> 1.2"
+
+gem "dartsass-rails", "~> 0.5.0"
+
+gem "importmap-rails", "~> 1.2"
+
+gem "propshaft", "~> 0.8.0"

Gemfile.lock

@@ -109,19 +109,24 @@ GEM
       xpath (~> 3.2)
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
-    config (4.2.1)
+    concurrent-ruby-ext (1.2.2)
+      concurrent-ruby (= 1.2.2)
+    config (5.0.0)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
     connection_pool (2.4.1)
     crass (1.0.6)
+    dartsass-rails (0.5.0)
+      railties (>= 6.0.0)
+      sass-embedded (~> 1.63)
     date (3.3.3)
     debug (1.8.0)
       irb (>= 1.5.0)
       reline (>= 0.3.1)
     debug_inspector (1.1.0)
     declarative (0.0.20)
     deep_merge (1.2.2)
-    devise (4.9.2)
+    devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -133,10 +138,10 @@ GEM
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
       railties (>= 3.2)
-    dry-configurable (1.0.1)
+    dry-configurable (1.1.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-core (1.0.0)
+    dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
     dry-inflector (1.0.0)
@@ -145,7 +150,7 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-schema (1.13.2)
+    dry-schema (1.13.3)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 1.0, >= 1.0.1)
       dry-core (~> 1.0, < 2)
@@ -227,6 +232,7 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
+    google-protobuf (3.24.4)
     govuk-components (4.1.1)
       html-attributes-utils (~> 1.0.0, >= 1.0.0)
       pagy (~> 6.0)
@@ -245,6 +251,9 @@ GEM
     httpclient (2.8.3)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    importmap-rails (1.2.1)
+      actionpack (>= 6.0.0)
+      railties (>= 6.0.0)
     invisible_captcha (2.1.0)
       rails (>= 5.2)
     io-console (0.6.0)
@@ -258,15 +267,15 @@ GEM
     language_server-protocol (3.17.0.3)
     launchy (2.5.2)
       addressable (~> 2.8)
-    loofah (2.21.3)
+    loofah (2.21.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
-    mail-notify (1.1.0)
+    mail-notify (1.2.0)
       actionmailer (>= 5.2.4.6)
       actionpack (>= 5.2.7.1)
       actionview (>= 5.2.7.1)
@@ -277,19 +286,19 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.4)
+    mini_portile2 (2.8.5)
     minitest (5.20.0)
     msgpack (1.7.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    net-imap (0.3.7)
+    net-imap (0.4.2)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.1)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
     nokogiri (1.15.4)
@@ -323,6 +332,11 @@ GEM
       racc
     pg (1.5.4)
     phonelib (0.8.4)
+    propshaft (0.8.0)
+      actionpack (>= 7.0.0)
+      activesupport (>= 7.0.0)
+      rack
+      railties (>= 7.0.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -337,8 +351,6 @@ GEM
     rack (2.2.8)
     rack-protection (3.1.0)
       rack (~> 2.2, >= 2.2.4)
-    rack-proxy (0.7.6)
-      rack
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (7.0.8)
@@ -383,7 +395,7 @@ GEM
       rack (>= 1.4)
     request_store_rails (2.0.0)
       concurrent-ruby (~> 1.0)
-    responders (3.1.0)
+    responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
@@ -447,14 +459,16 @@ GEM
     sanitize (6.1.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
+    sass-embedded (1.69.3)
+      google-protobuf (~> 3.23)
+      rake (>= 13.0.0)
     scenic (1.7.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    semantic_range (3.0.0)
-    sentry-rails (5.11.0)
+    sentry-rails (5.12.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.11.0)
-    sentry-ruby (5.11.0)
+      sentry-ruby (~> 5.12.0)
+    sentry-ruby (5.12.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
     shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)
@@ -480,14 +494,7 @@ GEM
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
-    sprockets (4.2.0)
-      concurrent-ruby (~> 1.0)
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.0)
-    thor (1.2.2)
+    thor (1.3.0)
     timeout (0.4.0)
     trailblazer-option (0.1.2)
     tzinfo (2.0.6)
@@ -507,18 +514,12 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webpacker (5.4.4)
-      activesupport (>= 5.2)
-      rack-proxy (>= 0.6.1)
-      railties (>= 5.2)
-      semantic_range (>= 2.3.0)
-    webrick (1.8.1)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.11)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby
@@ -531,7 +532,10 @@ DEPENDENCIES
   brakeman
   bundler-audit
   capybara
-  config (~> 4.2)
+  concurrent-ruby
+  concurrent-ruby-ext
+  config (~> 5.0)
+  dartsass-rails (~> 0.5.0)
   debug
   devise (~> 4.9)
   dfe-analytics!
@@ -545,16 +549,18 @@ DEPENDENCIES
   govuk-components (= 4.1.1)
   govuk_design_system_formbuilder
   httparty (~> 0.21)
+  importmap-rails (~> 1.2)
   invisible_captcha
   jbuilder
   launchy
-  mail-notify (~> 1.1)
+  mail-notify (~> 1.2)
   notifications-ruby-client
   okcomputer
   omniauth-azure-activedirectory-v2
   pagy
   pg (~> 1.5)
   phonelib
+  propshaft (~> 0.8.0)
   pry-byebug
   puma (~> 6.4)
   rails (~> 7.0.8)
@@ -565,19 +571,17 @@ DEPENDENCIES
   rubocop-rails
   rubocop-rspec
   scenic
-  sentry-rails (~> 5.11)
+  sentry-rails (~> 5.12)
   shoulda-matchers (~> 5.0)
   sidekiq (~> 6.5)
   sidekiq-cron (~> 1.10)
   simplecov
-  sprockets-rails
   tzinfo-data
   uk_postcode
   web-console
-  webpacker
 
 RUBY VERSION
-   ruby 3.1.3p185
+   ruby 3.1.4p223
 
 BUNDLED WITH
    2.1.4

Procfile.dev

@@ -1,2 +1,2 @@
 web: bin/rails server -p $PORT
-webpack: bin/webpack-dev-server
+sass: bin/rails dartsass:watch

Tiltfile

@@ -11,11 +11,13 @@ resources = [
     "redis",
     "database",
     "app",
-    "worker"
+    "worker",
+    "nginx"
 ]
 
 
 if local_app:
+    resources.remove("nginx")
     resources.remove("app")
     resources.remove("worker")
     local_resource(