Fixing generator webpacker issues (decidim#8427)

tremend-cofe · Oct 26, 2021 · af0889b · af0889b
1 parent 0b93792
commit af0889b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/decidim-generators/lib/decidim/generators/component_generator.rb b/decidim-generators/lib/decidim/generators/component_generator.rb
@@ -35,8 +35,9 @@ def component(component_name)
         template "circleci/config.yml", "#{component_folder}/.circleci/config.yml"
 
         app_folder = "#{component_folder}/app"
-        template "app/assets/config/component_manifest.js", "#{app_folder}/assets/config/decidim_#{component_name}_manifest.js"
-        template "app/assets/images/decidim/component/icon.svg", "#{app_folder}/assets/images/decidim/#{component_name}/icon.svg"
+        template "app/packs/js/entrypoint.js", "#{app_folder}/packs/entrypoints/decidim_#{component_name}.js"
+        template "app/packs/images/decidim/component/icon.svg", "#{app_folder}/packs/images/decidim/#{component_name}/icon.svg"
+        template "app/packs/stylesheets/decidim/default.scss", "#{app_folder}/packs/stylesheets/decidim/#{component_name}/#{component_name}.scss"
         template "app/controllers/decidim/component/application_controller.rb.erb", "#{app_folder}/controllers/decidim/#{component_name}/application_controller.rb"
         template "app/controllers/decidim/component/admin/application_controller.rb.erb", "#{app_folder}/controllers/decidim/#{component_name}/admin/application_controller.rb"
         template "app/helpers/decidim/component/application_helper.rb.erb", "#{app_folder}/helpers/decidim/#{component_name}/application_helper.rb"
@@ -47,6 +48,7 @@ def component(component_name)
         chmod "#{bin_folder}/rails", "+x"
 
         config_folder = "#{component_folder}/config"
+        template "config/assets.rb.erb", "#{config_folder}/assets.rb"
         template "config/locales/en.yml.erb", "#{config_folder}/locales/en.yml"
         template "config/i18n-tasks.yml.erb", "#{config_folder}/i18n-tasks.yml"
 

diff --git a/decidim-generators/lib/decidim/generators/component_templates/app/packs/js/entrypoint.js b/decidim-generators/lib/decidim/generators/component_templates/app/packs/js/entrypoint.js
@@ -0,0 +1,2 @@
+// Images
+require.context("../images", true)
diff --git a/...ors/lib/decidim/generators/component_templates/app/packs/stylesheets/decidim/default.scss b/...ors/lib/decidim/generators/component_templates/app/packs/stylesheets/decidim/default.scss
@@ -0,0 +1 @@
+/* css for decidim_<%= component_name %> */
diff --git a/decidim-generators/lib/decidim/generators/component_templates/config/assets.rb.erb b/decidim-generators/lib/decidim/generators/component_templates/config/assets.rb.erb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+base_path = File.expand_path("..", __dir__)
+
+Decidim::Webpacker.register_path("#{base_path}/app/packs")
+Decidim::Webpacker.register_entrypoints(
+  decidim_<%= component_name %>: "#{base_path}/app/packs/entrypoints/decidim_<%= component_name %>.js"
+)
+Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/<%= component_name %>/<%= component_name %>")