Skip to content

Commit

Permalink
align shakapacker npm and gem versions
Browse files Browse the repository at this point in the history
  • Loading branch information
barmintor committed Sep 2, 2024
1 parent 1177399 commit eadc2af
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ end
gem 'bigdecimal', '~>3.0'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.1.0'
gem 'shakapacker', '~> 7.0.0'
gem 'shakapacker', '7.2.2'
gem 'sassc'
gem "font-awesome-sass", "~> 6.4.0"
fa_token = font_awesome_token
Expand Down
6 changes: 4 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ GEM
omniauth (~> 1.2)
orm_adapter (0.5.0)
ostruct (0.5.5)
package_json (0.1.0)
parallel (1.23.0)
parser (3.2.2.3)
ast (~> 2.4.1)
Expand Down Expand Up @@ -426,8 +427,9 @@ GEM
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
semantic_range (3.0.0)
shakapacker (7.0.3)
shakapacker (7.2.2)
activesupport (>= 5.2)
package_json
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
Expand Down Expand Up @@ -550,7 +552,7 @@ DEPENDENCIES
rubyzip (>= 1.2.1)
sassc
selenium-webdriver (~> 4.16.0)
shakapacker (~> 7.0.0)
shakapacker (= 7.2.2)
sqlite3 (~> 1.4)
uglifier (>= 1.3.0)
view_component (~> 2.82.0)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"resolve-url-loader": "^4.0.0",
"sass": "^1.66.1",
"sass-loader": "^13.3.2",
"shakapacker": "^7.0.3",
"shakapacker": "7.2.2",
"style-loader": "^3.3.3",
"terser-webpack-plugin": "^5.3.9",
"url": "^0.11.2",
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4933,7 +4933,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==

shakapacker@^7.0.3:
shakapacker@7.2.2:
version "7.2.2"
resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-7.2.2.tgz#58f565ce0a1b3efb91effaed982d0ac5811af57c"
integrity sha512-TSHEztaNcfhUqwap2arvAmvIm9YNbqlYjxaS4cYPxtqGH/2UQD98hKjztHBdphceOjTV6ea5Yj235egWh8E15Q==
Expand Down

0 comments on commit eadc2af

Please sign in to comment.