github-pages 215 → 216

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9032f6656a1d4086f4b2b82819493d377a43e25a7d654f30d44f5b7397c29d44
-  data.tar.gz: 69d52115409b6702b1dcdb6d8d1587c7ca1b79c29e69648df7beb02a919a317f
+  metadata.gz: 33c32cb8c1a7230c5ebe969a924255c927920feb595e239ff2c925ddfab7b62a
+  data.tar.gz: 12703aa440be953579bf71449ffdfcc99ac5385055a6f91c46d80c3e82a1d177
 SHA512:
-  metadata.gz: 99b43599cf5c351ff3b943c87cd067bf5ba6713c238e76ae7d2d28206744cca818fac9f7cce8b8501fe434ebe6a89dd4767c58dd2ae64e19f7036c93722714b4
-  data.tar.gz: 22c4d2c1e625c60e60552ca5ab1df8f1fc6401d3ed3c5de7f788a828815742e5f473412cb349a1107b8bc404e509702785051bc06591c7f12e9d38726468b9e4
+  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/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 = 215
+  VERSION = 216
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-pages
 version: !ruby/object:Gem::Version
-  version: '215'
+  version: '216'
 platform: ruby
 authors:
 - GitHub, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -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.