Skip to content

Commit

Permalink
Merge pull request #4196 from Crown-Commercial-Service/ensure-shakapa…
Browse files Browse the repository at this point in the history
…cker-versions-match

Ensure shakapacker GEM and NODE versions match
  • Loading branch information
tim-s-ccs authored Feb 22, 2024
2 parents 7218cba + 25e0c44 commit 653d7f2
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ gem 'sass-rails', '~> 6.0', '>= 6.0.0'

gem 'sprockets-rails'

gem 'shakapacker', '~> 7.2.1'
gem 'shakapacker', '~> 7.2.2'

gem 'turbolinks', '~> 5'

Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ GEM
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
semantic_range (3.0.0)
shakapacker (7.2.1)
shakapacker (7.2.2)
activesupport (>= 5.2)
package_json
rack-proxy (>= 0.6.1)
Expand Down Expand Up @@ -696,7 +696,7 @@ DEPENDENCIES
rubyzip (>= 1.2.1)
sass-rails (~> 6.0, >= 6.0.0)
selenium-webdriver (>= 3.142.3)
shakapacker (~> 7.2.1)
shakapacker (~> 7.2.2)
shoulda-matchers (>= 5.1.0)
show_me_the_cookies (>= 6.0.0)
sidekiq (~> 7.2.0)
Expand Down
2 changes: 1 addition & 1 deletion config/shakapacker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ default: &default
webpack_loader: 'babel'

# Set to true to enable check for matching versions of shakapacker gem and NPM package - will raise an error if there is a mismatch or wildcard versioning is used
ensure_consistent_versioning: false
ensure_consistent_versioning: true

# Select whether the compiler will use SHA digest ('digest' option) or most most recent modified timestamp ('mtime') to determine freshness
compiler_strategy: digest
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"govuk-frontend": "^4.7.0",
"jquery": "^3.7.1",
"js-cookie": "^3.0.5",
"shakapacker": "7.2.1",
"shakapacker": "^7.2.2",
"terser-webpack-plugin": "^5.3.10",
"turbolinks": "^5.2.0",
"typescript": "^5.3.3",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3788,10 +3788,10 @@ [email protected]:
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==

[email protected].1:
version "7.2.1"
resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-7.2.1.tgz#de9895bbbb6b6ee1016478dbbb8d4c37b25e5a50"
integrity sha512-IRPkEdIY2JiPfj7fnQ9sP8SBaUcaArMVBHAn3ctB91FndgyaM/bfXXlSEiveWPT3A3wkoadx44U6pKXo1DdC3w==
shakapacker@^7.2.2:
version "7.2.2"
resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-7.2.2.tgz#58f565ce0a1b3efb91effaed982d0ac5811af57c"
integrity sha512-TSHEztaNcfhUqwap2arvAmvIm9YNbqlYjxaS4cYPxtqGH/2UQD98hKjztHBdphceOjTV6ea5Yj235egWh8E15Q==
dependencies:
glob "^7.2.0"
js-yaml "^4.1.0"
Expand Down

0 comments on commit 653d7f2

Please sign in to comment.