alchemy_cms 6.1.8 → 6.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b02b1827373388eef312f0827ecd2eb0420ed571ce65f733f18cfbe4f93792af
-  data.tar.gz: de56936cfd3185a8a285260d508de58e8ceb2bb72247cf34eabc4bc117cba672
+  metadata.gz: 1e57f538575b1848dca1f02c32a155a573681bc67333cb48f4e1574da79c7cb2
+  data.tar.gz: 7c3e86cc3f897089fb81b746cd38f28cd99dbdb427d49efe1094e49440bbaaf7
 SHA512:
-  metadata.gz: 4ced2c28559fbd0d3434135e9202cf6362983fc553e5e58e593cbb8195b9c2176e8c2649e8f27ad2117abc1394534094dedc4c15df92f7af831fa4202045dc9c
-  data.tar.gz: df9a73acf89ce60303c5fc55a7a9d869d589780ea7e9556318acea7e9cd63a8d2743f9593d325105c0294b0b680f30c870dc7cd7991ee0a4f847c38dc588f837
+  metadata.gz: 2f23376e2a905fa72680efc4027d53bf9cfedf3a2f4679b0d966cf3011aa1d9b527e8b2700bb1717471adf67d495daeb36c8b279bae28b22f5bef7590388aa03
+  data.tar.gz: 4bf037decb428c03d0d67ac001f0f04dff65b7629319eacf5aa2195284fc4e7c7560a562c581136805101b1ef33883507a0aeb6cf3d38ac2535941d7b27e5a1f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 6.1.9 (2023-08-29)
+
+- [6.1-stable] Merge pull request #2571 from tvdeyen/fix-non-stupid-digest-assets [#2573](https://github.com/AlchemyCMS/alchemy_cms/pull/2573) ([github-actions](https://github.com/apps/github-actions))
+- [6.1] Show if element is using contents or ingredients [#2568](https://github.com/AlchemyCMS/alchemy_cms/pull/2568) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 6.1.8 (2023-07-31)
 
 - [v6.1]  Use selenium-webdriver instead of webdrivers gem  [#2531](https://github.com/AlchemyCMS/alchemy_cms/pull/2531) ([mamhoff](https://github.com/mamhoff))

data/lib/alchemy/tasks/usage.rb

@@ -11,10 +11,11 @@ module Alchemy
           .group(:name)
           .order("count DESC, name ASC")
           .map { |e| {"name" => e.name, "count" => e.count} }
-        Alchemy::Element.definitions.reject { |definition| res.map { |e| e["name"] }.include? definition["name"] }.sort_by { |d| d["name"] }.each do |definition|
-          res << {"name" => definition["name"], "count" => 0}
-        end
-        res
+        Alchemy::Element.definitions.map do |definition|
+          count = res.find { |r| r["name"] == definition["name"] }&.fetch("count") || 0
+          definition["count"] = count
+          definition
+        end.sort_by { |r| -1 * r["count"] }
       end
 
       def pages_count_by_type

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "6.1.8"
+  VERSION = "6.1.9"
 
   def self.version
     VERSION

data/lib/non_stupid_digest_assets.rb

@@ -19,7 +19,7 @@ module NonStupidDigestAssets
     def whitelisted_assets(assets)
       assets.select do |logical_path, _digest_path|
         whitelist.any? do |item|
-          item =~ logical_path
+          /#{item}/ =~ logical_path
         end
       end
     end

data/lib/tasks/alchemy/usage.rake

@@ -30,7 +30,11 @@ namespace :alchemy do
       puts "  ----------------------"
       puts "\n"
       results.each do |row|
-        puts "  #{number_with_delimiter(row["count"])} 𝗑 #{row["name"]}"
+        ingredients = row.key?("ingredients") ? "uses ingredients ✅" : nil
+        contents = row.key?("contents") ? "still uses contents ‼️" : nil
+        type = ingredients || contents
+        suffix = type ? " · #{type}" : nil
+        puts "  #{number_with_delimiter(row["count"])} 𝗑 #{row["name"]}#{suffix}"
       end
       puts "\n  = #{number_with_delimiter(Alchemy::Element.count)} elements in total."
     else

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.1.8",
+  "version": "6.1.9",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 6.1.8
+  version: 6.1.9
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2023-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer