alchemy_cms 6.1.8 โ†’ 6.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b02b1827373388eef312f0827ecd2eb0420ed571ce65f733f18cfbe4f93792af
4
- data.tar.gz: de56936cfd3185a8a285260d508de58e8ceb2bb72247cf34eabc4bc117cba672
3
+ metadata.gz: 1e57f538575b1848dca1f02c32a155a573681bc67333cb48f4e1574da79c7cb2
4
+ data.tar.gz: 7c3e86cc3f897089fb81b746cd38f28cd99dbdb427d49efe1094e49440bbaaf7
5
5
  SHA512:
6
- metadata.gz: 4ced2c28559fbd0d3434135e9202cf6362983fc553e5e58e593cbb8195b9c2176e8c2649e8f27ad2117abc1394534094dedc4c15df92f7af831fa4202045dc9c
7
- data.tar.gz: df9a73acf89ce60303c5fc55a7a9d869d589780ea7e9556318acea7e9cd63a8d2743f9593d325105c0294b0b680f30c870dc7cd7991ee0a4f847c38dc588f837
6
+ metadata.gz: 2f23376e2a905fa72680efc4027d53bf9cfedf3a2f4679b0d966cf3011aa1d9b527e8b2700bb1717471adf67d495daeb36c8b279bae28b22f5bef7590388aa03
7
+ data.tar.gz: 4bf037decb428c03d0d67ac001f0f04dff65b7629319eacf5aa2195284fc4e7c7560a562c581136805101b1ef33883507a0aeb6cf3d38ac2535941d7b27e5a1f
data/CHANGELOG.md CHANGED
@@ -1,5 +1,10 @@
1
1
  # Changelog
2
2
 
3
+ ## 6.1.9 (2023-08-29)
4
+
5
+ - [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
+ - [6.1] Show if element is using contents or ingredients [#2568](https://github.com/AlchemyCMS/alchemy_cms/pull/2568) ([tvdeyen](https://github.com/tvdeyen))
7
+
3
8
  ## 6.1.8 (2023-07-31)
4
9
 
5
10
  - [v6.1] Use selenium-webdriver instead of webdrivers gem [#2531](https://github.com/AlchemyCMS/alchemy_cms/pull/2531) ([mamhoff](https://github.com/mamhoff))
@@ -11,10 +11,11 @@ module Alchemy
11
11
  .group(:name)
12
12
  .order("count DESC, name ASC")
13
13
  .map { |e| {"name" => e.name, "count" => e.count} }
14
- Alchemy::Element.definitions.reject { |definition| res.map { |e| e["name"] }.include? definition["name"] }.sort_by { |d| d["name"] }.each do |definition|
15
- res << {"name" => definition["name"], "count" => 0}
16
- end
17
- res
14
+ Alchemy::Element.definitions.map do |definition|
15
+ count = res.find { |r| r["name"] == definition["name"] }&.fetch("count") || 0
16
+ definition["count"] = count
17
+ definition
18
+ end.sort_by { |r| -1 * r["count"] }
18
19
  end
19
20
 
20
21
  def pages_count_by_type
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Alchemy
4
- VERSION = "6.1.8"
4
+ VERSION = "6.1.9"
5
5
 
6
6
  def self.version
7
7
  VERSION
@@ -19,7 +19,7 @@ module NonStupidDigestAssets
19
19
  def whitelisted_assets(assets)
20
20
  assets.select do |logical_path, _digest_path|
21
21
  whitelist.any? do |item|
22
- item =~ logical_path
22
+ /#{item}/ =~ logical_path
23
23
  end
24
24
  end
25
25
  end
@@ -30,7 +30,11 @@ namespace :alchemy do
30
30
  puts " ----------------------"
31
31
  puts "\n"
32
32
  results.each do |row|
33
- puts " #{number_with_delimiter(row["count"])} ๐—‘ #{row["name"]}"
33
+ ingredients = row.key?("ingredients") ? "uses ingredients โœ…" : nil
34
+ contents = row.key?("contents") ? "still uses contents โ€ผ๏ธ" : nil
35
+ type = ingredients || contents
36
+ suffix = type ? " ยท #{type}" : nil
37
+ puts " #{number_with_delimiter(row["count"])} ๐—‘ #{row["name"]}#{suffix}"
34
38
  end
35
39
  puts "\n = #{number_with_delimiter(Alchemy::Element.count)} elements in total."
36
40
  else
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@alchemy_cms/admin",
3
- "version": "6.1.8",
3
+ "version": "6.1.9",
4
4
  "description": "AlchemyCMS",
5
5
  "browser": "package/admin.js",
6
6
  "files": [
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.1.8
4
+ version: 6.1.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2023-07-31 00:00:00.000000000 Z
16
+ date: 2023-08-29 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: actionmailer