github-pages 212 → 216

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2858d4e4a5820702c60e849542933c8808f2ec8ba1ea5b35bda3d5bdadc13eac
-  data.tar.gz: 87ce7072efde372a42a87babeab68b9c0285aad6371fc253e33e4d80327b282f
+  metadata.gz: 33c32cb8c1a7230c5ebe969a924255c927920feb595e239ff2c925ddfab7b62a
+  data.tar.gz: 12703aa440be953579bf71449ffdfcc99ac5385055a6f91c46d80c3e82a1d177
 SHA512:
-  metadata.gz: b412a9d830778e97d5c206c960dd2780dc9a7ea4aa54f94334efd3367f3c4cdc86925440ec2d31d210be16d812faec6b6d80d1f3a8b5f3a9981be35fc6aff82e
-  data.tar.gz: 4f27b8075b6b546701fa12e83a8825ad9e71abbba53f7f870c9cb7a58cbf123d31547064fe1917f6a4d45da102c6d34fa1d89dc6fd30b8edc314f0c10ace5c88
+  metadata.gz: 29dd85ba7d3f90df2538ef6fe01901b26c5baabe6b174d7861038926ecaed298e43f9f34ff5eb903dbc7c3da3efc142951f61c891407f0fcfe37a32fe8e9f906
+  data.tar.gz: 87217b0e5fd1fcebf8e4b93265e5d9089c521d4fb198741a963c4309f57c4488a432f2f356873a4f244bb5dcc84c6fcb2f3949dc7a37f8b258032a8f9a39a06f

data/lib/github-pages/configuration.rb

@@ -107,6 +107,7 @@ module GitHubPages
         # Allow theme to be explicitly disabled via "theme: null"
         config["theme"] = user_config["theme"] if user_config.key?("theme")
 
+        migrate_theme_to_remote_theme(config)
         exclude_cname(config)
 
         # Merge overwrites into user config
@@ -156,6 +157,16 @@ module GitHubPages
         }
       end
 
+      # If the user has set a 'theme', then see if we can automatically use remote theme instead.
+      def migrate_theme_to_remote_theme(config)
+        return unless config["theme"]
+        return unless GitHubPages::Plugins::THEMES_TO_CONVERT_TO_REMOTE_THEMES.key?(config["theme"])
+
+        theme_name = config.delete("theme")
+        config["remote_theme"] ||= GitHubPages::Plugins::THEMES_TO_CONVERT_TO_REMOTE_THEMES[theme_name]
+        config["plugins"] = Array(config["plugins"]).concat(["jekyll-remote-theme"]).uniq
+      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"]

data/lib/github-pages/dependencies.rb

@@ -11,14 +11,14 @@ module GitHubPages
       "jekyll-sass-converter" => "1.5.2",
 
       # Converters
-      "kramdown" => "2.3.0",
+      "kramdown" => "2.3.1",
       "kramdown-parser-gfm" => "1.1.0",
       "jekyll-commonmark-ghpages" => "0.1.6",
 
       # Misc
       "liquid" => "4.0.3",
       "rouge" => "3.26.0",
-      "github-pages-health-check" => "1.17.0",
+      "github-pages-health-check" => "1.17.2",
 
       # Plugins
       "jekyll-redirect-from" => "0.16.0",
@@ -30,7 +30,7 @@ module GitHubPages
       "jekyll-seo-tag" => "2.7.1",
       "jekyll-github-metadata" => "2.13.0",
       "jekyll-avatar" => "0.7.0",
-      "jekyll-remote-theme" => "0.4.2",
+      "jekyll-remote-theme" => "0.4.3",
 
       # Plugins to match GitHub.com Markdown
       "jemoji" => "0.12.0",

data/lib/github-pages/plugins.rb

@@ -48,21 +48,25 @@ module GitHubPages
 
     # Themes
     THEMES = {
-      "jekyll-swiss" => "1.0.0",
       "minima" => "2.5.1",
-      "jekyll-theme-primer" => "0.5.4",
-      "jekyll-theme-architect" => "0.1.1",
-      "jekyll-theme-cayman" => "0.1.1",
-      "jekyll-theme-dinky" => "0.1.1",
-      "jekyll-theme-hacker" => "0.1.2",
-      "jekyll-theme-leap-day" => "0.1.1",
-      "jekyll-theme-merlot" => "0.1.1",
-      "jekyll-theme-midnight" => "0.1.1",
-      "jekyll-theme-minimal" => "0.1.1",
-      "jekyll-theme-modernist" => "0.1.1",
-      "jekyll-theme-slate" => "0.1.1",
-      "jekyll-theme-tactile" => "0.1.1",
-      "jekyll-theme-time-machine" => "0.1.1",
     }.freeze
+
+    # Themes to convert to remote themes
+    THEMES_TO_CONVERT_TO_REMOTE_THEMES = {
+      "jekyll-swiss" => "broccolini/swiss",
+      "jekyll-theme-primer" => "pages-themes/primer@v0.5.4",
+      "jekyll-theme-architect" => "pages-themes/architect@v0.1.1",
+      "jekyll-theme-cayman" => "pages-themes/cayman@v0.1.1",
+      "jekyll-theme-dinky" => "pages-themes/dinky@v0.1.1",
+      "jekyll-theme-hacker" => "pages-themes/hacker@v0.1.1",
+      "jekyll-theme-leap-day" => "pages-themes/leap-day@v0.1.1",
+      "jekyll-theme-merlot" => "pages-themes/merlot@v0.1.1",
+      "jekyll-theme-midnight" => "pages-themes/midnight@v0.1.1",
+      "jekyll-theme-minimal" => "pages-themes/minimal@v0.1.1",
+      "jekyll-theme-modernist" => "pages-themes/modernist@v0.1.1",
+      "jekyll-theme-slate" => "pages-themes/slate@v0.1.1",
+      "jekyll-theme-tactile" => "pages-themes/tactile@v0.1.1",
+      "jekyll-theme-time-machine" => "pages-themes/time-machine@v0.1.1",
+    }
   end
 end

data/lib/github-pages/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitHubPages
-  VERSION = 212
+  VERSION = 216
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-pages
 version: !ruby/object:Gem::Version
-  version: '212'
+  version: '216'
 platform: ruby
 authors:
 - GitHub, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: kramdown-parser-gfm
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 1.17.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 1.17.2
 - !ruby/object:Gem::Dependency
   name: jekyll-redirect-from
   requirement: !ruby/object:Gem::Requirement
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: jemoji
   requirement: !ruby/object:Gem::Requirement
@@ -360,20 +360,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.5.3
-- !ruby/object:Gem::Dependency
-  name: jekyll-swiss
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: minima
   requirement: !ruby/object:Gem::Requirement
@@ -388,188 +374,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.5.1
-- !ruby/object:Gem::Dependency
-  name: jekyll-theme-primer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-- !ruby/object:Gem::Dependency
-  name: jekyll-theme-architect
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: jekyll-theme-cayman
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: jekyll-theme-dinky
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: jekyll-theme-hacker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-- !ruby/object:Gem::Dependency
-  name: jekyll-theme-leap-day
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: jekyll-theme-merlot
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: jekyll-theme-midnight
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: jekyll-theme-minimal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: jekyll-theme-modernist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: jekyll-theme-slate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: jekyll-theme-tactile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: jekyll-theme-time-machine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: mercenary
   requirement: !ruby/object:Gem::Requirement
@@ -707,7 +511,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Track GitHub Pages dependencies.