decidim-generators 0.24.3 → 0.25.0.rc4

data/lib/decidim/generators/app_generator.rb

@@ -65,6 +65,10 @@ module Decidim
                                default: false,
                                desc: "Add the necessary gems to profile the app"
 
+      class_option :force_ssl, type: :string,
+                               default: "true",
+                               desc: "Doesn't force to use ssl"
+
       def database_yml
         template "database.yml.erb", "config/database.yml", force: true
       end
@@ -97,18 +101,13 @@ module Decidim
       def gemfile
         return if options[:skip_gemfile]
 
-        copy_file target_gemfile, "Gemfile", force: true
-        copy_file "#{target_gemfile}.lock", "Gemfile.lock", force: true
-
-        gem_modifier = if options[:path]
-                         "path: \"#{options[:path]}\""
-                       elsif options[:edge]
-                         "git: \"https://github.com/decidim/decidim.git\", branch: \"develop\""
-                       elsif options[:branch]
-                         "git: \"https://github.com/decidim/decidim.git\", branch: \"#{options[:branch]}\""
-                       else
-                         "\"#{Decidim::Generators.version}\""
-                       end
+        if branch.present?
+          get target_gemfile, "Gemfile", force: true
+          get "#{target_gemfile}.lock", "Gemfile.lock", force: true
+        else
+          copy_file target_gemfile, "Gemfile", force: true
+          copy_file "#{target_gemfile}.lock", "Gemfile.lock", force: true
+        end
 
         gsub_file "Gemfile", /gem "#{current_gem}".*/, "gem \"#{current_gem}\", #{gem_modifier}"
 
@@ -137,8 +136,6 @@ module Decidim
             cache_dir: File.expand_path(File.join("..", "tmp", "cache"), __dir__),
             development_mode: env == "development",
             load_path_cache: true,
-            autoload_paths_cache: true,
-            disable_trace: false,
             compile_cache_iseq: !ENV["SIMPLECOV"],
             compile_cache_yaml: true
           )
@@ -156,6 +153,12 @@ module Decidim
 
       def decidim_initializer
         copy_file "initializer.rb", "config/initializers/decidim.rb"
+
+        if options[:force_ssl] == "false"
+          gsub_file "config/initializers/decidim.rb",
+                    /# config.force_ssl = true/,
+                    "config.force_ssl = false"
+        end
       end
 
       def authorization_handler
@@ -221,6 +224,22 @@ module Decidim
 
       private
 
+      def gem_modifier
+        @gem_modifier ||= if options[:path]
+                            "path: \"#{options[:path]}\""
+                          elsif branch.present?
+                            "git: \"https://github.com/decidim/decidim.git\", branch: \"#{branch}\""
+                          else
+                            "\"#{Decidim::Generators.version}\""
+                          end
+      end
+
+      def branch
+        return if options[:path]
+
+        @branch ||= options[:edge] ? "develop" : options[:branch].presence
+      end
+
       def app_name
         options[:app_name] || super
       end
@@ -242,6 +261,8 @@ module Decidim
       def target_gemfile
         root = if options[:path]
                  expanded_path
+               elsif branch.present?
+                 "https://raw.githubusercontent.com/decidim/decidim/#{branch}/decidim-generators"
                else
                  root_path
                end

data/lib/decidim/generators/app_templates/_decidim-settings.scss

@@ -0,0 +1,7 @@
+// This is a file that can be overridden by the application in order to override
+// some of the Foundation/Decidim SCSS settings and variables after the default
+// settings have been loaded.
+//
+// To override styles use decidim_application.scss
+//
+// By default this is empty.

data/lib/decidim/generators/app_templates/decidim_application.js

@@ -0,0 +1,5 @@
+// This file is compiled inside Decidim core pack. Code can be added here and will be executed
+// as part of that pack
+
+// Load images
+require.context("../../images", true)

data/lib/decidim/generators/app_templates/decidim_application.scss

@@ -0,0 +1,7 @@
+// This is a file that can be overridden by the application in order to override styles
+// Notice that this file is included at the very end of the stylesheets packs to have
+// more priority
+//
+// To override CSS variables or Foundation settings use _decidim-settings.scss
+//
+// By default this is empty.

data/lib/decidim/generators/app_templates/secrets.yml.erb

@@ -32,17 +32,15 @@ default: &default
     server: <%%= ENV["ETHERPAD_SERVER"] %>
     api_key: <%%= ENV["ETHERPAD_API_KEY"] %>
     api_version: "1.2.1"
-  bulletin_board:
-    identification_private_key: {"kty":"RSA","n":"pNgMt8lnPDD3TlWYGhRiV1oZkPQmnLdiUzwyb_-35qKD9k-HU86xo0uSgoOUWkBtnvFscq8zNDPAGAlZVokaN_z9ksZblSce0LEl8lJa3ICgghg7e8vg_7Lz5dyHSQ3PCLgenyFGcL401aglDde1Xo4ujdz33Lklc4U9zoyoLUI2_viYmNOU6n5Mn0sJd30FeICMrLD2gX46pGe3MGug6groT9EvpKcdOoJHKoO5yGSVaeY5-Bo3gngvlgjlS2mfwjCtF4NYwIQSd2al-p4BKnuYAVKRSgr8rYnnjhWfJ4GsCaqiyXNi5NPYRV6gl_cx_1jUcA1rRJqQR32I8c8QbAXm5qNO4URcdaKys9tNcVgXBL1FsSdbrLVVFWen1tfWNfHm-8BjiWCWD79-uk5gI0SjC9tWvTzVvswWXI5weNqqVXqpDydr46AsHE2sG40HRCR3UF3LupT-HwXTcYcOZr5dJClJIsU3Hrvy4wLssub69YSNR1Jxn-KX2vUc06xY8CNIuSMpfufEq5cZopL6O2l1pRsW1FQnF3s078_Y9MaQ1gPyBo0IipLBVUj5IjEIfPuiEk4jxkiUYDeqzf7bAvSFckp94yLkRWTs_pEZs7b_ogwRG6WMHjtcaNYe4CufhIm9ekkKDeAWOPRTHfKNmohRBh09XuvSjqrx5Z7rqb8","e":"AQAB","kid":"b8dba1459df956d60107690c34fa490db681eac4f73ffaf6e4055728c02ddc8e","d":"Uh3KIBe1VJez6pLbBUrYPlmE2N-3CGSWF46qNX62lq6ofB_b8xTJCuaPonJ3iYoE0aPEeVDrefq5m3-0wFXl-LQPgXlMj_1_7UgB9jeuSZ_N1WDK6P2EJPx5YS09O1gkpVxK7Mx_sZQe77wmUUH-eI7tg__qfUrB7E0Yn_cTpBATI2qlYaQsz6-A7e1MVvixq_ilmzVAZvuBrPp5mCZVb6FlXrV_PU9-UPIrD3O1La1lfO6SPBSbSGQkmGHwD2QbkHn9D_R_Vs-z_0TkM_dX71jIPQhrle3pN222KuJ8eQqwr9QP6biQMBuT5eKgr3MVtfUDRpp4sCEq9GIFwSd8LvbmGPrOoz8ueOEQ05nisIBQuOTYiWpYs2CEV062HR1bLFRLDUcSlflGNr0bgiXTUFx4wxRG06OaI-rQ6nG3M8TE0I0phMNCG3c7YyV28z_k2I65oQF9aKtiwFwc0YsUSGPTOFZGWHuCCPLm0lFeebpI_JIYqIv70NJxbSZEBY8DAIqZPqP6y_CRo2_C7piCgsjg9pnF8cp45vz4L6DWZ0Tumc_5aRuqIBkYXXwP9TjqhzxL-2SQHIqUAjj6Y6S35tZT6ekZSbnPIKX_e42y6bDT_Ztf01QfKiTkcx3_I8RwOuh6CzJzr72AykQpU3XKOKF1x1GBtYyrno4jG5LgaGE","p":"1UARZ-rRnpKG5NHKlXTys3irCy-d91edHL3fEIzDKvhMRQCIWh7dt8l0_sIpcBF-EbVilbFKj7yfgZBTr8EkAXHgweayK8rnlMqi2jte1_u-5DBtrGVVUTSQltSLDOZHK5QfUxVK6Bbk8K5ROLvef91oNgnSNWNOeoCZdlS55nMZcAgY_6mxSuuMq54Tgy8o4Ip890-ZEYY6OSFXhU-ieoGO4Jw--c6QzmCa3gGo2oVClidMNaM1jquK4Pj6xaoxR2NWeIX9Ix7k1P2B24pegyHXjSIpQ6JYdn352VViXi2tx7TTJh6ClNVjgoRmL4Gfy_IJNx0GhF5OB3yughUc7w","q":"xePJGBt466qM9F0BPxWFjyWbIs_GNXr-lBGASui0Z94cfgFbsZwqRsWQEf7jDVQsDNVnPSWZ_Wd6UqoQaIxc0tE8gaokPG6A4EUDyoLaZ231ZydDVoWof8FnPDaJwrcPwZ4R6ZLKGmkfytCZuU9I_9B4uuV0dyjEzKfS-Os3UcLumKPlgJ71OZAb49GTqUHuTePcSJjyYOYXx6eE7i_1m8TjU9Ut18BJNQhLqWmerA6X1ijbR2_syY6GXhGSfciSBH8xVkiUnqXb2jt1bE8nwWw-Sam5ikjzNbXqqs978IcCE5HTddQmy99bwuArA8PLqIFj3OOO1CSo8oyn2XDgMQ","dp":"Diky_rOZN-6DBq7nxQT_GOvqb9O5qbMnu8DgDzlJvJDAf9SJOXLTRmEaY9CA7_A5bvOcmFQtn13nObNb20_4FCB7zGSFcGMI_dh2-Ab5RV5yTrTok4onID1dXKbAlRq1ny825U2Eq-TZTyJEQoA3RkZtpSkBzInLrFbd2f3GWodKKSZggpnCLDd4H-1fXlbDYCXSJpoikAdZ1nFgXnnrUDdKRaAajnwpIYtIvXVewSQYR-BULzunUtIRZt8hx_6FRzhRha9gH_TtPTeYZ_vISuz0Y2rhUpx1Q2kaLlR9M8PUxm47l0xvX3LMKN6h6oWxFtn7wq0qwZ-Bjv24mOrOAQ","dq":"nXGD10hURrwk9W7hxP0sjB2Rdnr06iv3THs4JWFL16_h32bZO1BSWoho_chbgYlMmtFXGFFIWVLxAcAI2gWC_MA4cbmapvIMW2LNh1vgxJW5v95_NuGUlECeEEwcAu1-_b7z5XBCmAy3nLem9sbb_5wv0hMpPH0VRvbnZeBO3SBIkO0lddYCqU-8wN9HqkyoexQleSUnAm1O0iy4GIHT2aEmdNaRaKy2EhmNiTZdZeseZueOvyGPtTVONp2ofacMdcN0z39jr22qo9DWtdusd7nVPOpqkllEF6GrGUeHBnGD92n4YjDuxRnqefu8fXxUFrcLav0p8CNSv9ek291woQ","qi":"w6hfKEBLLHRWPkjajgxZyyetj-UFfVkILRT0plOllJ2JV8whcOXRXbiXH2r8zqMeyMFrrMwmuvv4TVQaruKB0ZQOG7Tz5Lw0RZEREOLnBwc3vSi_iLd-jBz01LdExTpqsAHMkaMQR9x62J8DE1ZNxVdn3ELYKik0f1L2r_WErzhvT1uq69HAybUp6WHcFYH0PSqHg4LOneXAdU1_g-ji2Zn9dlA_2oYGQ5S6JXPV7v2IVbEFpxyVD1lPbFT0iKhyZZevictjgD_JGHveIVqsq5w0Csyz08h0oEW9hYEq-4bquMxSf18gjldoS5uQPD7FUECgL8bxsCdc4hP6UEKYGw"}
-    server: http://bulletin-board.lvh.me:8000/api
-    websocket_url: ws://bulletin-board.lvh.me:8000/cable
-    api_key: "89Ht70GZNcicu8WEyagz_rRae6brbqZAGuBEICYBCii-PTV3MAstAtx1aRVe5H5YfODi-JgYPvyf9ZMH7tOeZ15e3mf9B2Ymgw7eknvBFMRP213YFGo1SPn_C4uLK90G"
-    number_of_trustees: 2
+  elections:
+    bulletin_board_server: <%%= ENV["ELECTIONS_BULLETIN_BOARD_SERVER"] || 'http://bulletin-board.lvh.me:8000/api' %>
+    bulletin_board_public_key: {"kty":"RSA","n":"zMXsZpYPKkDlSmezX898y7zNOaJ7ENIN4kj4UhQ95Vm4HlgTpIs2VMMsO0eqynMaOR_G1mXdqbpbaJtXijBe4V8323QwGm6WVAa71E7pDXa5g6-uo5f8GePitN0YER9y2yNQN4uTaNzJiWV2uLBUYfMdj3SIif31YwLULHAOj3B_oleFK8coE_Qr3NzATcYBmsqE8AR4NljxTO6KDmP1SLdf5GBOBhOAIFbnL_Kpj2xkm7MS3hjMVKpiRhqA1UgX5oKZ8ixBv46fNJF0pBsHi3fHNjK9oZzgdx_AI-YFpdE_40-8bh_g9sWzxacqOM2-MdQLHbvRPEVltO3E8tr6I5YWrylcP7l9VD8OJeqjq2qFYHnGYdmLoD2XuXmI9EuBvSb9H4-qcartxZSIQCimKib_fxZvgrG1FSRRhK6YpvIdGv4-G2zfCCRsC4XD80TYI2bf-oYCoy7eU3_eVHFMV2yg4p1Wnuw2Vgq0edPL_bKaV9JvGx7F-U5juxNN0WZR9LzbPl4ReejzN95lyHgbj0nTH_u3bSpZmgJrQF-PwdnPcG46deVjJgUeosrlC4lQxVrRz0GL58BuFunnz2uYDBDrcJCiG60EbdkAFHjOcXU4wrUWATin7je_aqdBXhSnkTafcJAMvL7Y2Ld7vDge8nLqjAVlAi5am3rN0kqKT6M","e":"AQAB","kid":"a8e86f02ca27e1861bfc49e2a9a4614ca9068f8efdb6d42d19d3aab0eb2a31be"}
+    authority_private_key: {"kty":"RSA","n":"pNgMt8lnPDD3TlWYGhRiV1oZkPQmnLdiUzwyb_-35qKD9k-HU86xo0uSgoOUWkBtnvFscq8zNDPAGAlZVokaN_z9ksZblSce0LEl8lJa3ICgghg7e8vg_7Lz5dyHSQ3PCLgenyFGcL401aglDde1Xo4ujdz33Lklc4U9zoyoLUI2_viYmNOU6n5Mn0sJd30FeICMrLD2gX46pGe3MGug6groT9EvpKcdOoJHKoO5yGSVaeY5-Bo3gngvlgjlS2mfwjCtF4NYwIQSd2al-p4BKnuYAVKRSgr8rYnnjhWfJ4GsCaqiyXNi5NPYRV6gl_cx_1jUcA1rRJqQR32I8c8QbAXm5qNO4URcdaKys9tNcVgXBL1FsSdbrLVVFWen1tfWNfHm-8BjiWCWD79-uk5gI0SjC9tWvTzVvswWXI5weNqqVXqpDydr46AsHE2sG40HRCR3UF3LupT-HwXTcYcOZr5dJClJIsU3Hrvy4wLssub69YSNR1Jxn-KX2vUc06xY8CNIuSMpfufEq5cZopL6O2l1pRsW1FQnF3s078_Y9MaQ1gPyBo0IipLBVUj5IjEIfPuiEk4jxkiUYDeqzf7bAvSFckp94yLkRWTs_pEZs7b_ogwRG6WMHjtcaNYe4CufhIm9ekkKDeAWOPRTHfKNmohRBh09XuvSjqrx5Z7rqb8","e":"AQAB","kid":"b8dba1459df956d60107690c34fa490db681eac4f73ffaf6e4055728c02ddc8e","d":"Uh3KIBe1VJez6pLbBUrYPlmE2N-3CGSWF46qNX62lq6ofB_b8xTJCuaPonJ3iYoE0aPEeVDrefq5m3-0wFXl-LQPgXlMj_1_7UgB9jeuSZ_N1WDK6P2EJPx5YS09O1gkpVxK7Mx_sZQe77wmUUH-eI7tg__qfUrB7E0Yn_cTpBATI2qlYaQsz6-A7e1MVvixq_ilmzVAZvuBrPp5mCZVb6FlXrV_PU9-UPIrD3O1La1lfO6SPBSbSGQkmGHwD2QbkHn9D_R_Vs-z_0TkM_dX71jIPQhrle3pN222KuJ8eQqwr9QP6biQMBuT5eKgr3MVtfUDRpp4sCEq9GIFwSd8LvbmGPrOoz8ueOEQ05nisIBQuOTYiWpYs2CEV062HR1bLFRLDUcSlflGNr0bgiXTUFx4wxRG06OaI-rQ6nG3M8TE0I0phMNCG3c7YyV28z_k2I65oQF9aKtiwFwc0YsUSGPTOFZGWHuCCPLm0lFeebpI_JIYqIv70NJxbSZEBY8DAIqZPqP6y_CRo2_C7piCgsjg9pnF8cp45vz4L6DWZ0Tumc_5aRuqIBkYXXwP9TjqhzxL-2SQHIqUAjj6Y6S35tZT6ekZSbnPIKX_e42y6bDT_Ztf01QfKiTkcx3_I8RwOuh6CzJzr72AykQpU3XKOKF1x1GBtYyrno4jG5LgaGE","p":"1UARZ-rRnpKG5NHKlXTys3irCy-d91edHL3fEIzDKvhMRQCIWh7dt8l0_sIpcBF-EbVilbFKj7yfgZBTr8EkAXHgweayK8rnlMqi2jte1_u-5DBtrGVVUTSQltSLDOZHK5QfUxVK6Bbk8K5ROLvef91oNgnSNWNOeoCZdlS55nMZcAgY_6mxSuuMq54Tgy8o4Ip890-ZEYY6OSFXhU-ieoGO4Jw--c6QzmCa3gGo2oVClidMNaM1jquK4Pj6xaoxR2NWeIX9Ix7k1P2B24pegyHXjSIpQ6JYdn352VViXi2tx7TTJh6ClNVjgoRmL4Gfy_IJNx0GhF5OB3yughUc7w","q":"xePJGBt466qM9F0BPxWFjyWbIs_GNXr-lBGASui0Z94cfgFbsZwqRsWQEf7jDVQsDNVnPSWZ_Wd6UqoQaIxc0tE8gaokPG6A4EUDyoLaZ231ZydDVoWof8FnPDaJwrcPwZ4R6ZLKGmkfytCZuU9I_9B4uuV0dyjEzKfS-Os3UcLumKPlgJ71OZAb49GTqUHuTePcSJjyYOYXx6eE7i_1m8TjU9Ut18BJNQhLqWmerA6X1ijbR2_syY6GXhGSfciSBH8xVkiUnqXb2jt1bE8nwWw-Sam5ikjzNbXqqs978IcCE5HTddQmy99bwuArA8PLqIFj3OOO1CSo8oyn2XDgMQ","dp":"Diky_rOZN-6DBq7nxQT_GOvqb9O5qbMnu8DgDzlJvJDAf9SJOXLTRmEaY9CA7_A5bvOcmFQtn13nObNb20_4FCB7zGSFcGMI_dh2-Ab5RV5yTrTok4onID1dXKbAlRq1ny825U2Eq-TZTyJEQoA3RkZtpSkBzInLrFbd2f3GWodKKSZggpnCLDd4H-1fXlbDYCXSJpoikAdZ1nFgXnnrUDdKRaAajnwpIYtIvXVewSQYR-BULzunUtIRZt8hx_6FRzhRha9gH_TtPTeYZ_vISuz0Y2rhUpx1Q2kaLlR9M8PUxm47l0xvX3LMKN6h6oWxFtn7wq0qwZ-Bjv24mOrOAQ","dq":"nXGD10hURrwk9W7hxP0sjB2Rdnr06iv3THs4JWFL16_h32bZO1BSWoho_chbgYlMmtFXGFFIWVLxAcAI2gWC_MA4cbmapvIMW2LNh1vgxJW5v95_NuGUlECeEEwcAu1-_b7z5XBCmAy3nLem9sbb_5wv0hMpPH0VRvbnZeBO3SBIkO0lddYCqU-8wN9HqkyoexQleSUnAm1O0iy4GIHT2aEmdNaRaKy2EhmNiTZdZeseZueOvyGPtTVONp2ofacMdcN0z39jr22qo9DWtdusd7nVPOpqkllEF6GrGUeHBnGD92n4YjDuxRnqefu8fXxUFrcLav0p8CNSv9ek291woQ","qi":"w6hfKEBLLHRWPkjajgxZyyetj-UFfVkILRT0plOllJ2JV8whcOXRXbiXH2r8zqMeyMFrrMwmuvv4TVQaruKB0ZQOG7Tz5Lw0RZEREOLnBwc3vSi_iLd-jBz01LdExTpqsAHMkaMQR9x62J8DE1ZNxVdn3ELYKik0f1L2r_WErzhvT1uq69HAybUp6WHcFYH0PSqHg4LOneXAdU1_g-ji2Zn9dlA_2oYGQ5S6JXPV7v2IVbEFpxyVD1lPbFT0iKhyZZevictjgD_JGHveIVqsq5w0Csyz08h0oEW9hYEq-4bquMxSf18gjldoS5uQPD7FUECgL8bxsCdc4hP6UEKYGw"}
     authority_name: "Decidim Test Authority"
-    scheme:
-      name: "dummy"
-      parameters:
-        quorum: 2
+    authority_api_key: "89Ht70GZNcicu8WEyagz_rRae6brbqZAGuBEICYBCii-PTV3MAstAtx1aRVe5H5YfODi-JgYPvyf9ZMH7tOeZ15e3mf9B2Ymgw7eknvBFMRP213YFGo1SPn_C4uLK90G"
+    scheme_name: "dummy"
+    quorum: 2
+    number_of_trustees: 2
 
 development:
   <<: *default
@@ -81,14 +79,12 @@ production:
   smtp_port: "587"
   smtp_starttls_auto: true
   smtp_authentication: "plain"
-  bulletin_board:
-    identification_private_key: <%%= ENV["BULLETIN_BOARD_IDENTIFICATION_PRIVATE_KEY"] %>
-    server: <%%= ENV["BULLETIN_BOARD_SERVER"] %>
-    websocket_url: <%%= ENV["BULLETIN_BOARD_WEBSOCKET_URL"] %>
-    api_key: <%%= ENV["BULLETIN_BOARD_API_KEY"] %>
-    number_of_trustees: <%%= ENV["BULLETIN_BOARD_NUMBER_OF_TRUSTEES"] %>
-    authority_name: <%%= ENV["BULLETIN_BOARD_AUTHORITY_NAME"] %>
-    scheme:
-      name: <%%= ENV["BULLETIN_BOARD_SCHEME_NAME"] %>
-      parameters:
-        quorum: <%%= ENV["BULLETIN_BOARD_SCHEME_QUORUM"] %>
+  elections:
+    bulletin_board_server: <%%= ENV["BULLETIN_BOARD_SERVER"] %>
+    bulletin_board_public_key: <%%= ENV["BULLETIN_BOARD_PUBLIC_KEY"] %>
+    authority_api_key: <%%= ENV["BULLETIN_BOARD_API_KEY"] %>
+    authority_name: <%%= ENV["AUTHORITY_NAME"] %>
+    authority_private_key: <%%= ENV["AUTHORITY_PRIVATE_KEY"] %>
+    scheme_name: <%%= ENV["ELECTIONS_SCHEME_NAME"] %>
+    number_of_trustees: <%%= ENV["ELECTIONS_NUMBER_OF_TRUSTEES"] %>
+    quorum: <%%= ENV["ELECTIONS_QUORUM"] %>

data/lib/decidim/generators/component_templates/Gemfile.erb

@@ -9,7 +9,6 @@ gem "decidim-<%= component_name %>", path: "."
 
 gem "puma", ">= 4.3"
 gem "bootsnap", "~> 1.4"
-gem "uglifier", "~> 4.1"
 
 group :development, :test do
   gem "byebug", "~> 11.0", platform: :mri
@@ -23,5 +22,5 @@ group :development do
   gem "listen", "~> 3.1"
   gem "spring", "~> 2.0"
   gem "spring-watcher-listen", "~> 2.0"
-  gem "web-console", "~> 3.5"
+  gem "web-console", "~> 4.0"
 end

data/lib/decidim/generators/component_templates/lib/decidim/component/component.rb.erb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/components/namer"
+require "decidim/components/namer"
 
 Decidim.register_component(:<%= component_name %>) do |component|
   component.engine = Decidim::<%= component_module_name %>::Engine

data/lib/decidim/generators/component_templates/lib/decidim/component/engine.rb.erb

@@ -14,10 +14,6 @@ module Decidim
         # resources :<%= component_name %>
         # root to: "<%= component_name %>#index"
       end
-
-      initializer "decidim_<%= component_name %>.assets" do |app|
-        app.config.assets.precompile += %w[decidim_<%= component_name %>_manifest.js decidim_<%= component_name %>_manifest.css]
-      end
     end
   end
 end

data/lib/decidim/generators/install_generator.rb

@@ -59,34 +59,6 @@ module Decidim
         remove_file "app/views/layouts/mailer.text.erb"
       end
 
-      def append_assets
-        append_file "app/assets/javascripts/application.js", "//= require decidim"
-        gsub_file "app/assets/javascripts/application.js", %r{//= require turbolinks\n}, ""
-        inject_into_file "app/assets/stylesheets/application.css",
-                         before: "*= require_tree ." do
-          "*= require decidim\n "
-        end
-
-        template "decidim.scss.erb", "app/assets/stylesheets/decidim.scss", force: true
-      end
-
-      def disable_precompilation_on_demand
-        %w(development test).each do |environment|
-          inject_into_file "config/environments/#{environment}.rb",
-                           before: /^end$/ do
-            cut <<~RUBY, strip: false
-              |
-              |  # No precompilation on demand on first request
-              |  config.assets.check_precompiled_asset = false
-            RUBY
-          end
-        end
-      end
-
-      def configure_js_compressor
-        gsub_file "config/environments/production.rb", "config.assets.js_compressor = :uglifier", "config.assets.js_compressor = Uglifier.new(:harmony => true)"
-      end
-
       def smtp_environment
         inject_into_file "config/environments/production.rb",
                          after: "config.log_formatter = ::Logger::Formatter.new" do
@@ -106,8 +78,44 @@ module Decidim
         end
       end
 
+      def install_decidim_webpacker
+        # Copy CSS files
+        copy_file "decidim_application.scss", "app/packs/stylesheets/decidim/decidim_application.scss"
+        copy_file "_decidim-settings.scss", "app/packs/stylesheets/decidim/_decidim-settings.scss"
+
+        # Copy JS application file
+        copy_file "decidim_application.js", "app/packs/src/decidim/decidim_application.js"
+
+        # Create empty directory for images
+        empty_directory "app/packs/images"
+
+        # Regenerate webpacker binstubs
+        remove_file "bin/yarn"
+        rails "webpacker:binstubs"
+
+        # Run Decidim custom webpacker installation
+        rails "decidim:webpacker:install"
+      end
+
+      def remove_old_assets
+        remove_file "config/initializers/assets.rb"
+        remove_dir("app/assets")
+        remove_dir("app/javascript")
+      end
+
+      def remove_sprockets_requirement
+        gsub_file "config/application.rb", %r{require ['"]rails/all['"]\R}, <<~RUBY
+          require "decidim/rails"
+          # Add the frameworks used by your app that are not loaded by Decidim.
+        RUBY
+
+        gsub_file "config/environments/development.rb", /config\.assets.*$/, ""
+        gsub_file "config/environments/test.rb", /config\.assets.*$/, ""
+        gsub_file "config/environments/production.rb", /config\.assets.*$/, ""
+      end
+
       def copy_migrations
-        rails "decidim:upgrade"
+        rails "decidim:choose_target_plugins", "railties:install:migrations"
         recreate_db if options[:recreate_db]
       end
 
@@ -173,11 +181,6 @@ module Decidim
         system("bin/rails", *args, err: File::NULL)
       end
 
-      def scss_variables
-        variables = File.join(Gem.loaded_specs["decidim-core"].full_gem_path, "app", "assets", "stylesheets", "decidim", "_variables.scss")
-        File.read(variables).split("\n").map { |line| "// #{line}".gsub(" !default", "") }.join("\n")
-      end
-
       def cut(text, strip: true)
         cutted = text.gsub(/^ *\|/, "")
         return cutted unless strip

data/lib/decidim/generators/version.rb

@@ -4,7 +4,7 @@
 module Decidim
   module Generators
     def self.version
-      "0.24.3"
+      "0.25.0.rc4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-generators
 version: !ruby/object:Gem::Version
-  version: 0.24.3
+  version: 0.25.0.rc4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,7 @@ files:
 - lib/decidim/generators/app_templates/Dockerfile.erb
 - lib/decidim/generators/app_templates/LICENSE-AGPLv3.txt
 - lib/decidim/generators/app_templates/README.md.erb
+- lib/decidim/generators/app_templates/_decidim-settings.scss
 - lib/decidim/generators/app_templates/another_dummy_authorization_handler.rb
 - lib/decidim/generators/app_templates/budgets_initializer.rb
 - lib/decidim/generators/app_templates/budgets_workflow_random.en.yml
@@ -67,7 +68,8 @@ files:
 - lib/decidim/generators/app_templates/cable.yml.erb
 - lib/decidim/generators/app_templates/carrierwave.rb
 - lib/decidim/generators/app_templates/database.yml.erb
-- lib/decidim/generators/app_templates/decidim.scss.erb
+- lib/decidim/generators/app_templates/decidim_application.js
+- lib/decidim/generators/app_templates/decidim_application.scss
 - lib/decidim/generators/app_templates/decidim_controller.rb.erb
 - lib/decidim/generators/app_templates/docker-compose-etherpad.yml
 - lib/decidim/generators/app_templates/docker-compose.yml.erb
@@ -82,12 +84,11 @@ files:
 - lib/decidim/generators/component_templates/LICENSE-AGPLv3.txt
 - lib/decidim/generators/component_templates/README.md.erb
 - lib/decidim/generators/component_templates/Rakefile
-- lib/decidim/generators/component_templates/app/assets/config/component_manifest.js
-- lib/decidim/generators/component_templates/app/assets/images/decidim/component/icon.svg
 - lib/decidim/generators/component_templates/app/controllers/decidim/component/admin/application_controller.rb.erb
 - lib/decidim/generators/component_templates/app/controllers/decidim/component/application_controller.rb.erb
 - lib/decidim/generators/component_templates/app/helpers/decidim/component/application_helper.rb.erb
 - lib/decidim/generators/component_templates/app/models/decidim/component/application_record.rb.erb
+- lib/decidim/generators/component_templates/app/packs/images/decidim/component/icon.svg
 - lib/decidim/generators/component_templates/bin/rails.erb
 - lib/decidim/generators/component_templates/circleci/config.yml
 - lib/decidim/generators/component_templates/config/i18n-tasks.yml.erb
@@ -120,9 +121,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.2
 signing_key:

data/lib/decidim/generators/app_templates/decidim.scss.erb

@@ -1,3 +0,0 @@
-<%= scss_variables %>
-
-@import "decidim/application";