From f39310d4153b49f6a942ef34af33aa7e924b10dd Mon Sep 17 00:00:00 2001 From: Theodor Vararu Date: Mon, 16 May 2022 13:25:11 +0200 Subject: [PATCH] Migrate from sprockets to propshaft This changeset was auto-generated by the `rails-template`: https://github.com/DFE-Digital/rails-template/pull/8 --- Gemfile | 4 ++-- Gemfile.lock | 14 ++++++-------- app/assets/config/manifest.js | 2 -- app/assets/stylesheets/application.scss | 10 ++++------ app/javascript/application.js | 2 -- config/application.rb | 2 ++ config/initializers/assets.rb | 12 ------------ package.json | 6 +----- yarn.lock | 23 ----------------------- 9 files changed, 15 insertions(+), 60 deletions(-) delete mode 100644 app/assets/config/manifest.js delete mode 100644 config/initializers/assets.rb diff --git a/Gemfile b/Gemfile index d0b33d1ab..55497dc99 100644 --- a/Gemfile +++ b/Gemfile @@ -6,8 +6,8 @@ ruby "3.1.1" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" gem "rails", "~> 7.0.3" -# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails] -gem "sprockets-rails" +# The newer and simpler asset pipeline for Rails [https://github.com/rails/propshaft] +gem "propshaft" # Use sqlite3 as the database for Active Record gem "sqlite3", "~> 1.4" diff --git a/Gemfile.lock b/Gemfile.lock index 17d4bbbff..f44f0779c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -148,6 +148,11 @@ GEM racc (~> 1.4) nokogiri (1.13.6-x86_64-linux) racc (~> 1.4) + propshaft (0.6.4) + actionpack (>= 7.0.0) + activesupport (>= 7.0.0) + rack + railties (>= 7.0.0) public_suffix (4.0.7) puma (5.6.4) nio4r (~> 2.0) @@ -209,13 +214,6 @@ GEM rspec-support (3.11.0) shoulda-matchers (5.1.0) activesupport (>= 5.2.0) - sprockets (4.0.3) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) sqlite3 (1.4.2) stimulus-rails (1.0.4) railties (>= 6.0.0) @@ -251,13 +249,13 @@ DEPENDENCIES govuk-components govuk_design_system_formbuilder importmap-rails + propshaft puma (~> 5.0) rails (~> 7.0.3) rladr rspec rspec-rails shoulda-matchers (~> 5.1) - sprockets-rails sqlite3 (~> 1.4) stimulus-rails tzinfo-data diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js deleted file mode 100644 index 99fcd3a34..000000000 --- a/app/assets/config/manifest.js +++ /dev/null @@ -1,2 +0,0 @@ -//= link_tree ../builds/images -//= link_tree ../builds/ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 45ff3eafb..1370358ae 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,7 +1,5 @@ -@import "govuk-frontend/govuk/all"; +$govuk-global-styles: true; +$govuk-new-link-styles: true; +$govuk-assets-path: "/"; -.app-related-items { - @include govuk-text-colour; - border-top: 2px solid $govuk-brand-colour; - padding-top: govuk-spacing(2); -} +@import "govuk-frontend/govuk/all"; diff --git a/app/javascript/application.js b/app/javascript/application.js index 2f44b32e2..9cbe475b4 100644 --- a/app/javascript/application.js +++ b/app/javascript/application.js @@ -1,5 +1,3 @@ -// import "./controllers"; - import { initAll } from "govuk-frontend"; initAll(); diff --git a/config/application.rb b/config/application.rb index ed067ca54..1523d0e8c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -35,5 +35,7 @@ class Application < Rails::Application config.generators.system_tests = nil config.exceptions_app = routes + + config.assets.paths << Rails.root.join('node_modules/govuk-frontend/govuk/assets') end end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb deleted file mode 100644 index 2eeef966f..000000000 --- a/config/initializers/assets.rb +++ /dev/null @@ -1,12 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Version of your assets, change this if you want to expire all your assets. -Rails.application.config.assets.version = "1.0" - -# Add additional assets to the asset load path. -# Rails.application.config.assets.paths << Emoji.images_path - -# Precompile additional assets. -# application.js, application.css, and all non-JS/CSS in the app/assets -# folder are already added. -# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/package.json b/package.json index 4e40760b3..3e908868a 100644 --- a/package.json +++ b/package.json @@ -2,16 +2,12 @@ "name": "app", "private": "true", "dependencies": { - "@hotwired/stimulus": "^3.0.1", - "@hotwired/turbo-rails": "^7.1.1", "govuk-frontend": "^4.0.1", "esbuild": "^0.14.23", "sass": "^1.49.8" }, "scripts": { "build:css": "sass --embed-sources --quiet-deps --load-path=node_modules ./app/assets/stylesheets/application.scss ./app/assets/builds/application.css", - "build:js": "esbuild app/javascript/*.* --bundle --outdir=app/assets/builds", - "preinstall": "mkdir -p app/assets/builds/{fonts,images}", - "postinstall": "cp -R node_modules/govuk-frontend/govuk/assets/fonts/. app/assets/builds/fonts && cp -R node_modules/govuk-frontend/govuk/assets/images/. app/assets/builds/images" + "build:js": "esbuild app/javascript/*.* --bundle --outdir=app/assets/builds" } } diff --git a/yarn.lock b/yarn.lock index c2eacc7e7..309627062 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,29 +2,6 @@ # yarn lockfile v1 -"@hotwired/stimulus@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.0.1.tgz#141f15645acaa3b133b7c247cad58ae252ffae85" - integrity sha512-oHsJhgY2cip+K2ED7vKUNd2P+BEswVhrCYcJ802DSsblJFv7mPFVk3cQKvm2vHgHeDVdnj7oOKrBbzp1u8D+KA== - -"@hotwired/turbo-rails@^7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-7.1.1.tgz#35c03b92b5c86f0137ed08bef843d955ec9bbe83" - integrity sha512-ZXpxUjCfkdbuXfoGrsFK80qsVzACs8xCfie9rt2jMTSN6o1olXVA0Nrk8u02yNEwSiVJm/4QSOa8cUcMj6VQjg== - dependencies: - "@hotwired/turbo" "^7.1.0" - "@rails/actioncable" "^7.0" - -"@hotwired/turbo@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.1.0.tgz#27e44e0e3dc5bd1d4bda0766d579cf5a14091cd7" - integrity sha512-Q8kGjqwPqER+CtpQudbH+3Zgs2X4zb6pBAlr6NsKTXadg45pAOvxI9i4QpuHbwSzR2+x87HUm+rot9F/Pe8rxA== - -"@rails/actioncable@^7.0": - version "7.0.3" - resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.3.tgz#71f08e958883af64f6a20489318b5e95d2c6dc5b" - integrity sha512-Iefl21FZD+ck1di6xSHMYzSzRiNJTHV4NrAzCfDfqc/wPz4xncrP8f2/fJ+2jzwKIaDn76UVMsALh7R5OzsF8Q== - anymatch@~3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"