Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: upgrade to Shakapacker v8 #672

Merged
merged 4 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ gem "rails", "~> 7.0.0"
gem "raygun4ruby"
gem "redis"
gem "sassc-rails"
gem "shakapacker", "~> 7.0"
gem "shakapacker", "~> 8.0"
gem "sidekiq"
gem "sidekiq-batch"
gem "sqlite3"
Expand Down
16 changes: 8 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ GEM
coderay (1.1.3)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
concurrent-ruby (1.3.3)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
crass (1.0.6)
date (3.3.4)
Expand Down Expand Up @@ -182,14 +182,14 @@ GEM
httparty (0.21.0)
mini_mime (>= 1.0.0)
multi_xml (>= 0.5.2)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
image_processing (1.12.2)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
iniparse (1.5.0)
inline_svg (1.7.2)
inline_svg (1.10.0)
activesupport (>= 3.0)
nokogiri (>= 1.6)
jmespath (1.6.1)
Expand Down Expand Up @@ -233,7 +233,7 @@ GEM
mini_magick (4.11.0)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.23.1)
minitest (5.25.1)
mock_redis (0.29.0)
ruby2_keywords
msgpack (1.4.2)
Expand All @@ -249,7 +249,7 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.3)
nokogiri (1.16.6)
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
orm_adapter (0.5.0)
Expand All @@ -272,7 +272,7 @@ GEM
nio4r (~> 2.0)
pundit (2.1.1)
activesupport (>= 3.0.0)
racc (1.8.0)
racc (1.8.1)
rack (2.2.9)
rack-canonical-host (1.1.0)
addressable (> 0, < 3)
Expand Down Expand Up @@ -388,7 +388,7 @@ GEM
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
semantic_range (3.0.0)
shakapacker (7.2.3)
shakapacker (8.0.1)
activesupport (>= 5.2)
package_json
rack-proxy (>= 0.6.1)
Expand Down Expand Up @@ -485,7 +485,7 @@ DEPENDENCIES
rubocop-rails
sassc-rails
selenium-webdriver
shakapacker (~> 7.0)
shakapacker (~> 8.0)
sidekiq
sidekiq-batch
simplecov
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
"stylelint-config-recommended-scss": "^14.1.0",
"webpack-dev-server": "^4.0.0"
},
"packageManager": "[email protected]",
"engines": {
"node": "^20.0.0",
"yarn": "^1.0.0"
Expand Down
4 changes: 2 additions & 2 deletions spec/views/signs/_card.html.erb_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
allow(view).to receive(:user_signed_in?).and_return(true)
allow(view).to receive(:present).with(sign).and_return(presenter)
expect(presenter).to receive(:comments_count).and_return(10)
expect(rendered).to have_selector(".sign-control--comments", text: "Comments\n\n\n\n 10")
expect(rendered).to have_selector(".sign-control--comments", text: "Comments\n\n\n 10")
end

it "shows an indicator on the comment icon when the user has unread comments" do
Expand All @@ -97,7 +97,7 @@

expect(rendered).to have_selector(
".sign-control--comments--unread",
text: "Comments\n\n\n\n 1")
text: "Comments\n\n\n 1")
end

it "does not show the comment count when the user is not signed in" do
Expand Down
4 changes: 2 additions & 2 deletions spec/views/signs/table/_row.html.erb_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
allow(view).to receive(:user_signed_in?).and_return(true)
allow(view).to receive(:present).with(sign).and_return(presenter)
expect(presenter).to receive(:comments_count).and_return(10)
expect(rendered).to have_selector(".sign-control--comments", text: "Comments\n\n\n\n 10")
expect(rendered).to have_selector(".sign-control--comments", text: "Comments\n\n\n 10")
end

it "shows an indicator on the comment icon when the user has unread comments" do
Expand All @@ -91,7 +91,7 @@

expect(rendered).to have_selector(
".sign-control--comments--unread",
text: "Comments\n\n\n\n 1")
text: "Comments\n\n\n 1")
end

it "does not show the comment count when the user is not signed in" do
Expand Down
Loading