cloudcannon-jekyll 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb81e7f467450a9da1c39bd68adbc69514aa0f33c982b1b70c540f05fe7dda70
-  data.tar.gz: eddc9663476a26ca3d0a503760b07760803ddcb852d7da7ae80c47be0d10ca8e
+  metadata.gz: 3054f2fad52e25c68f74efaea8d7adaf4186eb3c553a1e4f0a8b0d8b7502a5dd
+  data.tar.gz: e4826cd5492f8081a32d6886b4d039ca65f464c8833d8653716a715c07112fcd
 SHA512:
-  metadata.gz: ec82c0e7f08018be8b5007911d1286301bdf6300f468e0c86afe3e622823bd0f3611348f8f69e6ab7124d260e89edcce5f44e107ccdbb51d956cc01a959b8db1
-  data.tar.gz: 7196b603e2a82dd61021a927903d3ff2a21506f107e15adf3e16c2986f0a997f42d644d43bb9cf2b357aa653cb02677b1d93ccda2998a5e1a9be4a8761c3570f
+  metadata.gz: a73fd3d4cf8f9a244ac744d05dabc6361972d9fbe669dfcfe13f651bfc1d6e71c6b5e5c1c7b172f46158fb9983df788d796dbe6da32fdb2d9a7ca440907f00fa
+  data.tar.gz: 2bfb1f2757052b0c30b2052765bd3ecedc7c1d8d5ee9c7eceeccad9a358facce4f1376b0a710aa07bc4d9dbe2968131149a11cd597f14351ccab087b12772261

data/HISTORY.md

@@ -1,3 +1,8 @@
+# 1.5.7
+
+* Fix pages collection clash with built-in pages
+* Fixed posts collection config data overwriting drafts data
+
 # 1.5.6
 
 * Force generator to run after other lowest priority plugins

data/lib/cloudcannon-jekyll/_cloudcannon/details-2.x.json

@@ -23,6 +23,6 @@
 		{% for collection in site.collections %}"{{ collection[0] | xml_escape }}": {{ collection[1].docs | cc_jsonify }}{% unless forloop.last %},{% endunless %}
 		{% endfor %}
 	},
-	"pages": {{ site.pages | cc_jsonify }},
+	"pages": {{ site.html_pages | cc_jsonify }},
 	"static-pages": {{ site.static_files | cc_static_files_jsonify }}
 }

data/lib/cloudcannon-jekyll/_cloudcannon/details-3.0-4.x.json

@@ -22,6 +22,6 @@
 		{% for collection in site.collections %}"{{ collection.label | xml_escape }}": {{ collection.docs | cc_jsonify }}{% unless forloop.last %},{% endunless %}
 		{% endfor %}
 	},
-	"pages": {{ site.pages | cc_jsonify }},
+	"pages": {{ site.html_pages | cc_jsonify }},
 	"static-pages": {{ site.static_files | cc_static_files_jsonify }}
 }

data/lib/cloudcannon-jekyll/_cloudcannon/details.json

@@ -36,6 +36,6 @@
 			{%- unless forloop.last %},{% endunless %}
 		{%- endfor -%}
 	},
-	"pages": {{ site.pages | cc_jsonify }},
+	"pages": {{ site.html_pages | cc_jsonify }},
 	"static-pages": {{ site.static_files | cc_static_files_jsonify }}
 }

data/lib/cloudcannon-jekyll/generator.rb

@@ -99,9 +99,7 @@ module CloudCannonJekyll
       collections_config["posts"] = { "output" => true } if Jekyll::VERSION.start_with? "2."
       drafts = @reader.read_drafts(collections_dir)
 
-      if collections_config.key?("posts")
-        collections_config["drafts"] = collections_config["posts"]&.dup || {}
-      elsif drafts.any?
+      if (collections_config.key?("posts") && !collections_config.key?("drafts")) || drafts.any?
         collections_config["drafts"] = {}
       end
 

data/lib/cloudcannon-jekyll/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CloudCannonJekyll
-  VERSION = "1.5.6"
+  VERSION = "1.5.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcannon-jekyll
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - CloudCannon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll