Ruby 3.3.6 / Rails 8.0.0

trade-tariff · Dec 9, 2024 · 271c8e3 · 271c8e3
1 parent c4888d4
commit 271c8e3
Show file tree

Hide file tree

Showing 20 changed files with 131 additions and 138 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -0,0 +1 @@
+defaults
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -123,7 +123,7 @@ jobs:
 
   ruby-checks:
     docker:
-      - image: "cimg/ruby:3.3.4-node"
+      - image: "cimg/ruby:3.3.6-node"
     steps:
       - checkout
       - run:
@@ -145,7 +145,7 @@ jobs:
 
   test:
     docker:
-      - image: cimg/ruby:3.3.4-node
+      - image: cimg/ruby:3.3.6-node
         environment:
           BUNDLE_JOBS: "3"
           BUNDLE_RETRY: "3"
@@ -176,7 +176,7 @@ jobs:
 
   notify-production-deployment:
     docker:
-      - image: cimg/ruby:3.3.4
+      - image: cimg/ruby:3.3.6
     steps:
       - checkout
 

diff --git a/.env.development b/.env.development
@@ -5,3 +5,5 @@ PORT=3003
 SERVICE_DEFAULT=uk
 TARIFF_API_HOST=http://localhost:3000/
 WEB_CONCURRENCY=0
+SECRET_TOKEN=8905973fd3036a2266dc0d8b3c910ce2d9e96e4b1f7c0f2bcf6a3036ecf41d37d1505000ada9ed020accc02eef87e552fb9f139340fbb3e5603e392a04f55131
+SECRET_KEY_BASE=ba5dab038058650fefe03a22bbb7af0645987100cfad65da9313d09cb1d332b0086a742effc441573ef0aefa8b09d8311be2b26b96cecb0f329000c4d0884599
diff --git a/.env.test b/.env.test
@@ -3,3 +3,5 @@ API_SERVICE_BACKEND_URL_OPTIONS={"uk":"http://localhost:3018","xi":"http://local
 BEARER_TOKEN=tariff-api-test-token
 SERVICE_DEFAULT=uk
 TARIFF_API_HOST='http://api.example.org'
+SECRET_TOKEN=e8ad2c6a26c5595f77e3f294387bd842b52a1540577d75ab2321780f590403bbb41d1acad03ccbc46063e78a207ad79ba9984918c40c3b1fda4f8b7fa88cabc5
+SECRET_KEY_BASE=84801eabac9c9fe3df53fc65512f9c34029064219ae91bc80ce8bc3053bcec56f4357c5615408d96392ef945c5dcfed42cde2531ce021aa610911febf9ff7458
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,10 @@ vendor
 yarn-error.log
 .byebug_history
 .direnv
+
+/public/packs
+/public/packs-test
+/node_modules
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -6,15 +6,15 @@ inherit_gem:
 require: rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 3.3.4
+  TargetRubyVersion: 3.3.6
   Exclude:
-    - 'db/schema.rb'
-    - 'vendor/**/*'
-    - 'bin/**'
-    - 'db/**/*'
-    - 'tmp/**/*'
-    - 'config/**/*'
-    - 'node_modules/**/*'
+    - "db/schema.rb"
+    - "vendor/**/*"
+    - "bin/**"
+    - "db/**/*"
+    - "tmp/**/*"
+    - "config/**/*"
+    - "node_modules/**/*"
 Layout/LineLength:
   Max: 120
 Layout/AccessModifierIndentation:

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.3.4
+3.3.6
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1 @@
+ruby 3.3.6
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build compilation image
-FROM ruby:3.3.4-alpine3.19 as builder
+FROM ruby:3.3.6-alpine3.19 as builder
 
 # The application runs from /app
 WORKDIR /app
@@ -43,7 +43,7 @@ RUN rm -rf node_modules log tmp && \
   find /usr/local/bundle/gems -name "*.html" -delete
 
 # Build runtime image
-FROM ruby:3.3.4-alpine3.19 as production
+FROM ruby:3.3.6-alpine3.19 as production
 
 RUN apk add --update --no-cache tzdata postgresql-dev nodejs && \
   cp /usr/share/zoneinfo/Europe/London /etc/localtime && \

diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ ruby File.read('.ruby-version').chomp
 
 # Server
 gem 'puma'
-gem 'rails', '~> 7.1.2'
+gem 'rails', '~> 8.0.0'
 
 gem 'routing-filter', github: 'trade-tariff/routing-filter'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -9,86 +9,83 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.4)
-      actionpack (= 7.1.4)
-      activesupport (= 7.1.4)
+    actioncable (8.0.0)
+      actionpack (= 8.0.0)
+      activesupport (= 8.0.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.4)
-      actionpack (= 7.1.4)
-      activejob (= 7.1.4)
-      activerecord (= 7.1.4)
-      activestorage (= 7.1.4)
-      activesupport (= 7.1.4)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.4)
-      actionpack (= 7.1.4)
-      actionview (= 7.1.4)
-      activejob (= 7.1.4)
-      activesupport (= 7.1.4)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
+    actionmailbox (8.0.0)
+      actionpack (= 8.0.0)
+      activejob (= 8.0.0)
+      activerecord (= 8.0.0)
+      activestorage (= 8.0.0)
+      activesupport (= 8.0.0)
+      mail (>= 2.8.0)
+    actionmailer (8.0.0)
+      actionpack (= 8.0.0)
+      actionview (= 8.0.0)
+      activejob (= 8.0.0)
+      activesupport (= 8.0.0)
+      mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.4)
-      actionview (= 7.1.4)
-      activesupport (= 7.1.4)
+    actionpack (8.0.0)
+      actionview (= 8.0.0)
+      activesupport (= 8.0.0)
       nokogiri (>= 1.8.5)
-      racc
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.4)
-      actionpack (= 7.1.4)
-      activerecord (= 7.1.4)
-      activestorage (= 7.1.4)
-      activesupport (= 7.1.4)
+      useragent (~> 0.16)
+    actiontext (8.0.0)
+      actionpack (= 8.0.0)
+      activerecord (= 8.0.0)
+      activestorage (= 8.0.0)
+      activesupport (= 8.0.0)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.4)
-      activesupport (= 7.1.4)
+    actionview (8.0.0)
+      activesupport (= 8.0.0)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.4)
-      activesupport (= 7.1.4)
+    activejob (8.0.0)
+      activesupport (= 8.0.0)
       globalid (>= 0.3.6)
-    activemodel (7.1.4)
-      activesupport (= 7.1.4)
-    activerecord (7.1.4)
-      activemodel (= 7.1.4)
-      activesupport (= 7.1.4)
+    activemodel (8.0.0)
+      activesupport (= 8.0.0)
+    activerecord (8.0.0)
+      activemodel (= 8.0.0)
+      activesupport (= 8.0.0)
       timeout (>= 0.4.0)
-    activestorage (7.1.4)
-      actionpack (= 7.1.4)
-      activejob (= 7.1.4)
-      activerecord (= 7.1.4)
-      activesupport (= 7.1.4)
+    activestorage (8.0.0)
+      actionpack (= 8.0.0)
+      activejob (= 8.0.0)
+      activerecord (= 8.0.0)
+      activesupport (= 8.0.0)
       marcel (~> 1.0)
-    activesupport (7.1.4)
+    activesupport (8.0.0)
       base64
+      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     backport (1.2.0)
     base64 (0.2.0)
-    benchmark (0.3.0)
+    benchmark (0.4.0)
     bigdecimal (3.1.8)
     bootsnap (1.18.4)
       msgpack (~> 1.2)
@@ -125,7 +122,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.3.4)
+    date (3.4.1)
     diff-lcs (1.5.1)
     docile (1.4.1)
     dotenv (3.1.2)
@@ -144,7 +141,7 @@ GEM
     factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
-    faraday (1.10.3)
+    faraday (1.10.4)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -197,10 +194,10 @@ GEM
       nokogiri (~> 1.12)
       rinku (~> 2.0)
       sanitize (~> 6)
-    govuk-components (5.6.1)
+    govuk-components (5.7.1)
       html-attributes-utils (~> 1.0.0, >= 1.0.0)
       pagy (>= 6, < 10)
-      view_component (>= 3.9, < 3.15)
+      view_component (>= 3.18, < 3.21)
     govuk_app_config (9.14.1)
       logstasher (~> 2.1)
       opentelemetry-exporter-otlp (>= 0.25, < 0.30)
@@ -218,9 +215,9 @@ GEM
       activemodel (>= 6.1)
       activesupport (>= 6.1)
       html-attributes-utils (~> 1)
-    govuk_personalisation (1.0.0)
+    govuk_personalisation (1.1.0)
       plek (>= 1.9.0)
-      rails (>= 6, < 8)
+      rails (>= 6, < 9)
     govuk_publishing_components (43.5.0)
       govuk_app_config
       govuk_personalisation (>= 0.7.0)
@@ -267,7 +264,7 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
-    logger (1.6.1)
+    logger (1.6.2)
     lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
@@ -290,14 +287,13 @@ GEM
     method_source (1.1.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
-    minitest (5.25.1)
+    minitest (5.25.4)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
     multipart-post (2.4.1)
-    mutex_m (0.2.0)
-    net-imap (0.4.16)
+    net-imap (0.5.1)
       date
       net-protocol
     net-pop (0.1.2)
@@ -567,20 +563,20 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rails (7.1.4)
-      actioncable (= 7.1.4)
-      actionmailbox (= 7.1.4)
-      actionmailer (= 7.1.4)
-      actionpack (= 7.1.4)
-      actiontext (= 7.1.4)
-      actionview (= 7.1.4)
-      activejob (= 7.1.4)
-      activemodel (= 7.1.4)
-      activerecord (= 7.1.4)
-      activestorage (= 7.1.4)
-      activesupport (= 7.1.4)
+    rails (8.0.0)
+      actioncable (= 8.0.0)
+      actionmailbox (= 8.0.0)
+      actionmailer (= 8.0.0)
+      actionpack (= 8.0.0)
+      actiontext (= 8.0.0)
+      actionview (= 8.0.0)
+      activejob (= 8.0.0)
+      activemodel (= 8.0.0)
+      activerecord (= 8.0.0)
+      activestorage (= 8.0.0)
+      activesupport (= 8.0.0)
       bundler (>= 1.15.0)
-      railties (= 7.1.4)
+      railties (= 8.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -592,10 +588,10 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.4)
-      actionpack (= 7.1.4)
-      activesupport (= 7.1.4)
-      irb
+    railties (8.0.0)
+      actionpack (= 8.0.0)
+      activesupport (= 8.0.0)
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
@@ -683,6 +679,7 @@ GEM
     sanitize (6.1.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
+    securerandom (0.4.0)
     semantic_range (3.0.0)
     sentry-rails (5.19.0)
       railties (>= 5.0)
@@ -748,9 +745,11 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.6.0)
+    uri (1.0.2)
+    useragent (0.16.11)
     version_gem (1.1.4)
-    view_component (3.14.0)
-      activesupport (>= 5.2.0, < 8.0)
+    view_component (3.20.0)
+      activesupport (>= 5.2.0, < 8.1)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
     warden (1.2.9)
@@ -807,7 +806,7 @@ DEPENDENCIES
   pry-rails
   puma
   pundit
-  rails (~> 7.1.2)
+  rails (~> 8.0.0)
   rails-controller-testing
   redis
   responders
@@ -827,7 +826,7 @@ DEPENDENCIES
   webpacker
 
 RUBY VERSION
-   ruby 3.3.4p94
+   ruby 3.3.6p108
 
 BUNDLED WITH
    2.5.11