github-pages 179 → 180

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0af6e2d0bc5e6eacf14bead097e524c941956ea6
-  data.tar.gz: 68032608a4b375e2bf4480b8b24fa1fd8c9ad585
+  metadata.gz: 6ceeb556c793b993cd6f39d8d8239460c3fd6462
+  data.tar.gz: 6b12926877be7a03bab1f59dba421dc1fb4ff4e3
 SHA512:
-  metadata.gz: fda519770a7c23652cf1804f1008cd8db21db78c77767c6fb61330c43a18a8b3f9d039628d65e2758f70b48e0b7ad46cb57074f5c0b449e69d320e3cb47189cf
-  data.tar.gz: 5b38f3d0156751714e946e2c713c112f500913f36b4813aee0f048989b8c1c78f5382d9c7856baf59767a3c37aca7ca8fecae8523fb8919384d02efa14525377
+  metadata.gz: d346ae929e377f1c21f98de905ebbf572c28564174f37ec4450f924038de76af7a476d1887d2fef7a0bd0e0666433b423f2e2e788915c103404f34a4ce875d0e
+  data.tar.gz: 88234345e2c4ed139c9c94108729e8e06b31b6595a6e35387975a684e8f5e5f9ff52f7d93350f1844a866b7452bebc74c48c3ff4ab0ce5541ef2363d623d4b7c

data/lib/github-pages/configuration.rb

@@ -23,6 +23,7 @@ module GitHubPages
         "hard_wrap" => false,
         "gfm_quirks" => "paragraph_end",
       },
+      "exclude" => ["CNAME"],
     }.freeze
 
     # User-overwritable defaults used only in production for practical reasons
@@ -100,24 +101,14 @@ module GitHubPages
           .fix_common_issues
           .add_default_collections
 
+        exclude_cname(config)
+
         # Merge overwrites into user config
         config = Jekyll::Utils.deep_merge_hashes config, OVERRIDES
 
         restrict_and_config_markdown_processor(config)
 
-        # Ensure we have those gems we want.
-        config["plugins"] = Array(config["plugins"]) | DEFAULT_PLUGINS
-
-        # To minimize erorrs, lazy-require jekyll-remote-theme if requested by the user
-        config["plugins"].push("jekyll-remote-theme") if config.key? "remote_theme"
-
-        if disable_whitelist?
-          config["whitelist"] = config["whitelist"] | config["plugins"]
-        end
-
-        if development?
-          config["whitelist"] = config["whitelist"] | DEVELOPMENT_PLUGINS
-        end
+        configure_plugins(config)
 
         config
       end
@@ -158,6 +149,29 @@ module GitHubPages
         }
       end
 
+      # If the user's 'exclude' config is the default, also exclude the CNAME
+      def exclude_cname(config)
+        return unless config["exclude"].eql? Jekyll::Configuration::DEFAULTS["exclude"]
+        config["exclude"].concat(DEFAULTS["exclude"])
+      end
+
+      # Requires default plugins and configures whitelist in development
+      def configure_plugins(config)
+        # Ensure we have those gems we want.
+        config["plugins"] = Array(config["plugins"]) | DEFAULT_PLUGINS
+
+        # To minimize erorrs, lazy-require jekyll-remote-theme if requested by the user
+        config["plugins"].push("jekyll-remote-theme") if config.key? "remote_theme"
+
+        return unless development?
+
+        if disable_whitelist?
+          config["whitelist"] = config["whitelist"] | config["plugins"]
+        end
+
+        config["whitelist"] = config["whitelist"] | DEVELOPMENT_PLUGINS
+      end
+
       # Print the versions for github-pages and jekyll to the debug
       # stream for debugging purposes. See by running Jekyll with '--verbose'
       def debug_print_versions

data/lib/github-pages/dependencies.rb

@@ -7,7 +7,7 @@ module GitHubPages
   class Dependencies
     VERSIONS = {
       # Jekyll
-      "jekyll"                    => "3.6.2",
+      "jekyll"                    => "3.7.3",
       "jekyll-sass-converter"     => "1.5.2",
 
       # Converters

data/lib/github-pages/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitHubPages
-  VERSION = 179
+  VERSION = 180
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-pages
 version: !ruby/object:Gem::Version
-  version: '179'
+  version: '180'
 platform: ruby
 authors:
 - GitHub, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.2
+        version: 3.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.2
+        version: 3.7.3
 - !ruby/object:Gem::Dependency
   name: jekyll-sass-converter
   requirement: !ruby/object:Gem::Requirement