decidim 0.25.0.rc1 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f0872745142de196217d5e776c6e730a5959c1595dadf21f64a98e9e594341b
-  data.tar.gz: b5c07a3463d76611a9935723b3285861328a184b7f83e9898ae5e19815d7ff2d
+  metadata.gz: b4b9922e88de129b511673c9ba40958c2afacdcaa07ec038b500af10badf4678
+  data.tar.gz: c7361bb91075206b25d6f737af846350b949971d6ccb4e4d3a4ada591c2631c0
 SHA512:
-  metadata.gz: ec01ba4ce4f74ccf4238cdc74b02a5c718911c427dcdd9a9c74991933c7fdc4b173ca58ae7015343f938f2334f46b71a827604086c1c7da4dfab8cddf0834a44
-  data.tar.gz: 90dbbc1250e18400ee0d5dbdf62193960aaef4dad895b5a3cfa6c6ff7bdef36bc4c00e20d88934e361ec295ef84021c7d836023fa365c0e8cb3ab80a6615e07b
+  metadata.gz: 806beb8e688782393414029fc83af33b50e9cde93a61f2da505473db0300fe768a560588c8b294149849c79c36a4fc31c38fbba3ff17df701440ae3337ad7cd9
+  data.tar.gz: 2dd05493e0d2702c7294e391551df7bafe27f4cd5039656591ac609c9b4f78c968f824076542166ce621a001576e590341519628160389abe4c4d6fe1fc13b1d

data/Rakefile

@@ -56,9 +56,10 @@ task :uninstall_all do
   Decidim::GemManager.uninstall_all
 end
 
-desc "Pushes a new build for each gem."
+desc "Pushes a new build for each gem and package."
 task release_all: [:update_versions, :check_locale_completeness] do
   Decidim::GemManager.run_all("rake release")
+  Decidim::GemManager.run_packages("npm publish --access public")
 end
 
 desc "Makes sure all official locales are complete and clean."
@@ -79,7 +80,31 @@ task :bundle do
   [".", "decidim-generators", "decidim_app-design"].each do |dir|
     Bundler.with_original_env do
       puts "Updating #{dir}...\n"
-      Dir.chdir(dir) { sh "bundle install" }
+      system!("bundle install", dir)
     end
   end
 end
+
+desc "Synchronize npm packages files on the whole repo"
+task :webpack do
+  FileUtils.rm_rf(decidim_app_design_path.join("package-lock.json"))
+  FileUtils.rm_rf(decidim_app_design_path.join("packages"))
+  FileUtils.cp_r(root_folder.join("package.json"), decidim_app_design_path)
+  FileUtils.cp_r(root_folder.join("package-lock.json"), decidim_app_design_path)
+  FileUtils.cp_r(root_folder.join("packages"), decidim_app_design_path)
+
+  system!("npm install", root_folder)
+  system!("npm install", decidim_app_design_path)
+end
+
+def root_folder
+  @root_folder ||= Pathname.new(__dir__)
+end
+
+def decidim_app_design_path
+  @decidim_app_design_path ||= Pathname.new(root_folder.join("decidim_app-design"))
+end
+
+def system!(command, path)
+  system("cd #{path} && #{command}") || abort("\n== Command #{command} failed ==")
+end

data/decidim-core/lib/decidim/webpacker/webpacker.yml

@@ -29,29 +29,26 @@ development:
     # Notice that we use a different port (to prevent blocking the default one) as
     # there will be at least two webpack servers running
     port: 3035
-    public: localhost:3035
-    # Inject browserside javascript that required by both HMR and Live(full) reload
-    inject_client: true
     # Hot Module Replacement updates modules while the application is running without a full reload
     hmr: false
-    # Inline should be set to true if using HMR; it inserts a script to take care of live reloading
-    inline: true
-    # Should we show a full-screen overlay in the browser when there are compiler errors or warnings?
-    overlay: true
+    client:
+      # Should we show a full-screen overlay in the browser when there are compiler errors or warnings?
+      overlay: true
+      # May also be a string
+      # webSocketURL:
+      #  hostname: "0.0.0.0"
+      #  pathname: "/ws"
+      #  port: 8080
     # Should we use gzip compression?
     compress: true
     # Note that apps that do not check the host are vulnerable to DNS rebinding attacks
-    disable_host_check: true
-    # This option lets the browser open with your local IP
-    use_local_ip: false
-    # When enabled, nothing except the initial startup information will be written to the console.
-    # This also means that errors or warnings from webpack are not visible.
-    quiet: false
-    pretty: false
+    allowed_hosts: "all"
+    pretty: true
     headers:
       'Access-Control-Allow-Origin': '*'
-    watch_options:
-      ignored: '**/node_modules/**'
+    static:
+      watch:
+        ignored: '**/node_modules/**'
 
 test:
   <<: *default

data/docs/modules/develop/pages/guide_migrate_webpacker_app.adoc

@@ -15,8 +15,8 @@ It's recommended to understand how Webpacker works. More information:
 
 Before starting the migration, please check you have the following dependencies installed:
 
-- Node.js version 15.14.0 (this version is mandatory)
-- Npm version 7.7.0 (it works with other versions, but this is the recommended)
+- Node.js version 16.9.x (this version is mandatory)
+- Npm version 7.21.x (it works with other versions, but this is the recommended)
 
 == Add Webpacker to the application
 

data/docs/modules/install/pages/manual.adoc

@@ -5,8 +5,8 @@ In order to develop on decidim, you'll need:
 * *Git* 2.15+
 * *PostgreSQL* 12.7+
 * *Ruby* 2.7.1
-* *NodeJS* 15.14.x
-* *Npm* 7.7.x
+* *NodeJS* 16.9.x
+* *Npm* 7.21.x
 * *ImageMagick*
 * *Chrome* browser and https://sites.google.com/a/chromium.org/chromedriver/[chromedriver].
 

data/lib/decidim/gem_manager.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/module/delegation"
 require "open3"
 
 module Decidim
@@ -53,9 +54,9 @@ module Decidim
       end
     end
 
-    def replace_version
+    def replace_gem_version
       Dir.chdir(@dir) do
-        self.class.replace_file(
+        replace_file(
           "lib/#{name.tr("-", "/")}/version.rb",
           /def self\.version(\s*)"[^"]*"/,
           "def self.version\\1\"#{version}\""
@@ -63,6 +64,16 @@ module Decidim
       end
     end
 
+    def replace_package_version
+      Dir.chdir(@dir) do
+        replace_file(
+          "package.json",
+          /^  "version": "[^"]*"/,
+          "  \"version\": \"#{semver_friendly_version(version)}\""
+        )
+      end
+    end
+
     def short_name
       name.gsub(/decidim-/, "")
     end
@@ -85,14 +96,12 @@ module Decidim
       end
 
       def replace_versions
-        replace_file(
-          "package.json",
-          /^  "version": "[^"]*"/,
-          "  \"version\": \"#{semver_friendly_version}\""
-        )
-
         all_dirs do |dir|
-          new(dir).replace_version
+          new(dir).replace_gem_version
+        end
+
+        package_dirs do |dir|
+          new(dir).replace_package_version
         end
       end
 
@@ -129,6 +138,14 @@ module Decidim
         end
       end
 
+      def run_packages(command, out: $stdout)
+        package_dirs do |dir|
+          status = new(dir).run(command, out: out)
+
+          break unless status || ENV["FAIL_FAST"] == "false"
+        end
+      end
+
       def version
         @version ||= File.read(version_file).strip
       end
@@ -146,20 +163,26 @@ module Decidim
         dirs.each { |dir| yield(dir) }
       end
 
+      def package_dirs
+        dirs = Dir.glob("#{root}/packages/*")
+
+        dirs.each { |dir| yield(dir) }
+      end
+
       def plugins
         Dir.glob("#{root}/decidim-*/")
       end
 
+      def semver_friendly_version(a_version)
+        a_version.gsub(/\.pre/, "-pre").gsub(/\.dev/, "-dev").gsub(/.rc(\d*)/, "-rc\\1")
+      end
+
       private
 
       def root
         File.expand_path(File.join("..", ".."), __dir__)
       end
 
-      def semver_friendly_version
-        version.gsub(/\.pre/, "-pre").gsub(/\.dev/, "-dev").gsub(/.rc(\d*)/, "-rc\\1")
-      end
-
       def version_file
         File.join(root, ".decidim-version")
       end
@@ -167,6 +190,8 @@ module Decidim
 
     private
 
+    delegate :plugins, :replace_file, :semver_friendly_version, :version, to: :class
+
     def interpolated_in_folder(command)
       Dir.chdir(@dir) do
         yield command.gsub("%version", version).gsub("%name", name)
@@ -178,11 +203,7 @@ module Decidim
     end
 
     def name
-      self.class.plugins.map { |name| File.expand_path(name) }.include?(@dir) ? folder_name : "decidim"
-    end
-
-    def version
-      self.class.version
+      plugins.map { |name| File.expand_path(name) }.include?(@dir) ? folder_name : "decidim"
     end
   end
 end

data/lib/decidim/version.rb

@@ -3,6 +3,6 @@
 # This holds the decidim version and the faker version it uses.
 module Decidim
   def self.version
-    "0.25.0.rc1"
+    "0.25.0"
   end
 end