Merge branch 'develop' into fix/footer_menu_attributes

Author: Stef-Rousset

.github/actions/spelling/expect.txt

@@ -845,6 +845,7 @@ sereneinserenade
 serializeds
 setseed
 sgid
+Shakacode
 shakapacker
 sharedapp
 shellcheckrc

.github/workflows/ci_core.yml

@@ -36,10 +36,10 @@ jobs:
             name: "System specs"
           - command: bundle exec parallel_test --type rspec --pattern spec/ --exclude-pattern 'spec/(system|lib|tasks)'
             name: "Tests without system, lib and tasks specs"
-          - command: bundle exec parallel_test --type rspec --pattern spec/tasks --exclude-pattern 'spec/tasks/decidim_tasks_webpacker_spec.rb'
+          - command: bundle exec parallel_test --type rspec --pattern spec/tasks --exclude-pattern 'spec/tasks/decidim_tasks_shakapacker_spec.rb'
             name: "Tasks specs"
-          - command: bundle exec rspec spec/tasks/decidim_tasks_webpacker_spec.rb
-            name: "Webpacker tasks specs"
+          - command: bundle exec rspec spec/tasks/decidim_tasks_shakapacker_spec.rb
+            name: "Shakapacker tasks specs"
     name: ${{ matrix.test.name }}
     uses: ./.github/workflows/test_app.yml
     secrets: inherit

.gitpod.yml

@@ -40,8 +40,8 @@ ports:
     port: 3000
     onOpen: open-preview
     visibility: public
-  - name: Webpacker
-    description: The webpacker dev server for asset reloading
+  - name: Shakapacker
+    description: The shakapacker dev server for asset reloading
     port: 3035
     onOpen: ignore
     visibility: public

Gemfile.lock

@@ -97,15 +97,15 @@ PATH
       premailer-rails (~> 1.10)
       rack (~> 2.2, >= 2.2.8.1)
       rack-attack (~> 6.0)
-      rails (~> 7.2.0)
+      rails (~> 7.2.0, >= 7.2.2.2)
       rails-i18n (~> 7.0)
       ransack (~> 4.2.0)
       redis (~> 4.1)
       request_store (~> 1.7.0)
       rqrcode (~> 2.2.0)
       rubyXL (~> 3.4)
       rubyzip (~> 2.0)
-      shakapacker (~> 7.1.0)
+      shakapacker (~> 8.3.0)
       valid_email2 (~> 7.0)
       web-push (~> 3.0)
       wisper (~> 3.0)
@@ -208,29 +208,29 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actioncable (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionmailbox (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       mail (>= 2.8.0)
-    actionmailer (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionmailer (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      actionview (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.1)
-      actionview (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionpack (7.2.2.2)
+      actionview (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4, < 3.2)
@@ -239,38 +239,38 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actiontext (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionview (7.2.2.2)
+      activesupport (= 7.2.2.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
     active_link_to (1.0.5)
       actionpack
       addressable
-    activejob (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activejob (7.2.2.2)
+      activesupport (= 7.2.2.2)
       globalid (>= 0.3.6)
-    activemodel (7.2.2.1)
-      activesupport (= 7.2.2.1)
-    activerecord (7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activemodel (7.2.2.2)
+      activesupport (= 7.2.2.2)
+    activerecord (7.2.2.2)
+      activemodel (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       timeout (>= 0.4.0)
-    activestorage (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activestorage (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       marcel (~> 1.0)
-    activesupport (7.2.2.1)
+    activesupport (7.2.2.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -342,7 +342,7 @@ GEM
     cmdparse (3.0.7)
     commonmarker (0.23.11)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    connection_pool (2.5.4)
     crack (1.0.0)
       bigdecimal
       rexml
@@ -555,7 +555,7 @@ GEM
       bigdecimal (~> 3.1)
     net-http (0.6.0)
       uri
-    net-imap (0.5.9)
+    net-imap (0.5.10)
       date
       net-protocol
     net-pop (0.1.2)
@@ -610,6 +610,7 @@ GEM
     openssl (3.3.0)
     orm_adapter (0.5.0)
     ostruct (0.6.3)
+    package_json (0.1.0)
     paper_trail (16.0.0)
       activerecord (>= 6.1)
       request_store (~> 1.4)
@@ -661,20 +662,20 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    rails (7.2.2.1)
-      actioncable (= 7.2.2.1)
-      actionmailbox (= 7.2.2.1)
-      actionmailer (= 7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actiontext (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    rails (7.2.2.2)
+      actioncable (= 7.2.2.2)
+      actionmailbox (= 7.2.2.2)
+      actionmailer (= 7.2.2.2)
+      actionpack (= 7.2.2.2)
+      actiontext (= 7.2.2.2)
+      actionview (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activemodel (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       bundler (>= 1.15.0)
-      railties (= 7.2.2.1)
+      railties (= 7.2.2.2)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -689,9 +690,9 @@ GEM
     rails-i18n (7.0.10)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    railties (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -822,8 +823,9 @@ GEM
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
     semantic_range (3.1.0)
-    shakapacker (7.1.0)
+    shakapacker (8.3.0)
       activesupport (>= 5.2)
+      package_json
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)

RELEASE_NOTES.md

@@ -110,6 +110,8 @@ You can read more about the Rails upgrade process on the following PRs:
 
 ### 1.5. Run these commands
 
+Shakapacker has been upgraded to the latest version. See section 3.10 for troubleshooting errors.
+
 ```console
 bundle update decidim
 bin/rails decidim:upgrade
@@ -422,7 +424,31 @@ This also includes renderers and parsers which used the hashtag object to render
 
 You can read more about this change on PR [#14803](https://github.com/decidim/decidim/pull/14803) and [#14868](https://github.com/decidim/decidim/pull/14868)
 
-### 3.9. [[TITLE OF THE ACTION]]
+### 3.10. Shakapacker upgrade
+
+In our efforts to continuously upgrade the platform, we are upgrading Shakapacker to the latest version available. That is v8.3.0 at the time of this release. If you encounter any error similar to this one:
+
+```console
+**ERROR** Shakapacker: Shakapacker gem and node package versions do not match
+Detected: 7.x.x
+     gem: 8.3.0
+Ensure the installed version of the gem is the same as the version of
+your installed node package.
+Do not use >= or ~> in your Gemfile for shakapacker without a lockfile.
+Do not use ^ or ~ in your package.json for shakapacker without a lockfile.
+```
+
+Please check if you have the following file `package.json`, and edit the version:
+
+```json
+    "shakapacker": "~8.3.0",
+```
+
+If the file does not exist, check and perform the same changes in the `packages/webpacker/package.json`
+
+You can read more about this change on PR [#15016](https://github.com/decidim/decidim/pull/15016).
+
+### 3.11. [[TITLE OF THE ACTION]]
 
 You can read more about this change on PR [#XXXX](https://github.com/decidim/decidim/pull/XXXX).
 

decidim-accountability/config/assets.rb

@@ -2,8 +2,8 @@
 
 base_path = File.expand_path("..", __dir__)
 
-Decidim::Webpacker.register_path("#{base_path}/app/packs")
-Decidim::Webpacker.register_entrypoints(
+Decidim::Shakapacker.register_path("#{base_path}/app/packs")
+Decidim::Shakapacker.register_entrypoints(
   decidim_accountability: "#{base_path}/app/packs/entrypoints/decidim_accountability.js",
   decidim_accountability_admin_form: "#{base_path}/app/packs/entrypoints/decidim_accountability_admin_form.js",
   decidim_accountability_admin_imports: "#{base_path}/app/packs/entrypoints/decidim_accountability_admin_imports.js",

decidim-accountability/lib/decidim/accountability/engine.rb

@@ -42,7 +42,7 @@ class Engine < ::Rails::Engine
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Accountability::Engine.root}/app/views")
       end
 
-      initializer "decidim_accountability.webpacker.assets_path" do
+      initializer "decidim_accountability.shakapacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
     end

decidim-admin/config/assets.rb

@@ -2,8 +2,8 @@
 
 base_path = File.expand_path("..", __dir__)
 
-Decidim::Webpacker.register_path("#{base_path}/app/packs")
-Decidim::Webpacker.register_entrypoints(
+Decidim::Shakapacker.register_path("#{base_path}/app/packs")
+Decidim::Shakapacker.register_entrypoints(
   decidim_admin_overrides: "#{base_path}/app/packs/entrypoints/decidim_admin_overrides.scss",
   decidim_admin: "#{base_path}/app/packs/entrypoints/decidim_admin.js"
 )

decidim-admin/lib/decidim/admin/engine.rb

@@ -80,7 +80,7 @@ class Engine < ::Rails::Engine
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Admin::Engine.root}/app/views") # for partials
       end
 
-      initializer "decidim_admin.webpacker.assets_path" do
+      initializer "decidim_admin.shakapacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
 

decidim-ai/lib/decidim/ai/spam_detection/resource/base.rb

@@ -40,7 +40,7 @@ def error_message(klass, method_name)
           end
 
           def resource_hidden?(resource)
-            resource.class.included_modules.include?(Decidim::Reportable) && resource.hidden? && report_reasons.exclude?(resource.reports&.last&.reason)
+            resource.class.included_modules.include?(Decidim::Reportable) && resource.hidden? && report_reasons.include?(resource.reports&.last&.reason)
           end
 
           def report_reasons