Skip to content

Commit 8e51f73

Browse files
authored
Merge pull request #5881 from alphagov/dependabot/bundler/govuk_publishing_components-29.6.0
Bump govuk_publishing_components from 28.9.2 to 29.6.0
2 parents dcd11f9 + 1961b28 commit 8e51f73

File tree

4 files changed

+15
-25
lines changed

4 files changed

+15
-25
lines changed

Gemfile.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,14 @@ GEM
151151
govuk_personalisation (0.11.2)
152152
plek (>= 1.9.0)
153153
rails (>= 6, < 8)
154-
govuk_publishing_components (28.9.2)
154+
govuk_publishing_components (29.6.0)
155155
govuk_app_config
156156
govuk_personalisation (>= 0.7.0)
157157
kramdown
158158
plek
159159
rails (>= 6)
160160
rouge
161-
sprockets (< 4)
161+
sprockets (>= 3)
162162
govuk_test (3.0.0)
163163
brakeman (>= 5.0.2)
164164
capybara
@@ -189,7 +189,7 @@ GEM
189189
json-schema (2.8.1)
190190
addressable (>= 2.4)
191191
kgio (2.11.4)
192-
kramdown (2.3.2)
192+
kramdown (2.4.0)
193193
rexml
194194
launchy (2.5.0)
195195
addressable (~> 2.7)
@@ -364,7 +364,7 @@ GEM
364364
plek (>= 1.1.0)
365365
rack
366366
rest-client
367-
sprockets (3.7.2)
367+
sprockets (4.0.3)
368368
concurrent-ruby (~> 1.0)
369369
rack (> 1, < 3)
370370
sprockets-rails (3.4.2)

app/assets/config/manifest.js

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
//= link application.css
2+
//= link print.css
3+
//= link visualise.css
4+
//= link joint.css
5+
//= link application.js
6+
//= link dagre.js
7+
//= link joint.layout.DirectedGraph.js
8+
//= link joint.js
9+
//= link joint.patch.js
10+
//= link test-dependencies.js
11+
//= link visualise.js

config/application.rb

-12
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,6 @@ class Application < Rails::Application
5959
# when router is proxying to this app but asset proxying isn't set up.
6060
config.asset_host = ENV["ASSET_HOST"]
6161

62-
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
63-
config.assets.precompile += %w[
64-
joint.patch.js
65-
joint.js
66-
joint.layout.DirectedGraph.js
67-
joint.css
68-
print.css
69-
dagre.js
70-
visualise.js
71-
visualise.css
72-
]
73-
7462
# Version of your assets, change this if you want to expire all your assets
7563
config.assets.version = "1.0"
7664

config/initializers/assets.rb

-9
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,4 @@
88
# Add Yarn node_modules folder to the asset load path.
99
# Rails.application.config.assets.paths << Rails.root.join('node_modules')
1010

11-
# Precompile additional assets.
12-
# application.js, application.css, and all non-JS/CSS in the app/assets
13-
# folder are already added.
14-
Rails.application.config.assets.precompile += %w[
15-
test-dependencies.js
16-
accessible-autocomplete/dist/accessible-autocomplete.min.js
17-
accessible-autocomplete/dist/accessible-autocomplete.min.css
18-
]
19-
2011
Rails.application.config.assets.paths << Rails.root.join("node_modules")

0 commit comments

Comments
 (0)