From 77282e45fd4ad2ac533591aab226da6f1e8ddd44 Mon Sep 17 00:00:00 2001 From: Laurence Andrews <59114061+andrewsio@users.noreply.github.com> Date: Mon, 3 Jan 2022 20:49:23 +0000 Subject: [PATCH 001/290] Update resources.md (#8925) Merge pull request 8925 --- docs/pages/resources.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/pages/resources.md b/docs/pages/resources.md index 86dc798d690..a5ee9e95924 100644 --- a/docs/pages/resources.md +++ b/docs/pages/resources.md @@ -44,7 +44,6 @@ Use a SaaS service as a backend for functionality on your Jekyll site - [Forestry.io](https://forestry.io/): A free Git-based responsive CMS, with content modeling and instant previews. - [Netlify CMS](https://www.netlifycms.org/): Open source content management for your Git workflow - [Siteleaf](https://www.siteleaf.com/): Built for developers, Loved by everyone - - [Statictastic](https://www.statictastic.com/): Static site hosting, publishing and content management for teams - [Kentico Kontent](https://github.com/Kentico/kontent-jekyll): A headless CMS with full control over content presentation ### E-commerce From 1008f1b4e32ed7f82d5d8a0d610b670b2a3b4454 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 3 Jan 2022 15:49:25 -0500 Subject: [PATCH 002/290] Update history to reflect merge of #8925 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index b6266f3c847..6074c78009b 100644 --- a/History.markdown +++ b/History.markdown @@ -47,6 +47,7 @@ * Manage repository meta documents consistently (#8908) * docs: add Layer0 deployment guide (#8915) * docs: Update REAMDE generated by `jekyll new-theme` (#8919) + * Update resources.md (#8925) ### Bug Fixes From b0a68d56fcbe143f9dbb617105fc564ca07f5dda Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 6 Jan 2022 20:46:00 +0530 Subject: [PATCH 003/290] Rewrite documentation on installing plugins (#8921) Merge pull request 8921 --- docs/_docs/plugins/installation.md | 154 +++++++++++++++++++---------- 1 file changed, 100 insertions(+), 54 deletions(-) diff --git a/docs/_docs/plugins/installation.md b/docs/_docs/plugins/installation.md index 2e4fad122d2..dcfc4e43ed5 100644 --- a/docs/_docs/plugins/installation.md +++ b/docs/_docs/plugins/installation.md @@ -3,77 +3,123 @@ title: Plugins permalink: /docs/plugins/installation/ --- -You have 3 options for installing plugins: +Jekyll has built-in support for using plugins to extend the core functionality. -1. In your site source root, make a `_plugins` directory. Place your plugins - here. Any file ending in `*.rb` inside this directory will be loaded before - Jekyll generates your site. +Primarily, any file with extension `.rb` placed within a `_plugins` directory at the root of the site's `source`, will be automatically loaded +during a build session. -2. In your `_config.yml` file, add a new array with the key `plugins` (or `gems` for Jekyll < `3.5.0`) and the - values of the gem names of the plugins you'd like to use. An example: +This behavior can be configured as follows: - ```yaml - # This will require each of these plugins automatically. - plugins: - - jekyll-gist - - jekyll-coffeescript - - jekyll-assets - - another-jekyll-plugin - ``` +- The `_plugins` directory may be changed either directly via the command-line or via the configuration file(s). +- Plugins in the `_plugins` directory (or its equivalent(s)) will not be loaded when Jekyll is running in `safe` mode. +- This route cannot be used to extend the Jekyll CLI. - Then install your plugins using `gem install jekyll-gist jekyll-coffeescript jekyll-assets another-jekyll-plugin` +To work with plugins packaged as gems, one has to list the desired gems in the configuration file under a top-level key named `plugins`. +Additionally, if you're building in `safe` mode, the gem needs to be listed under a top-level key named `whitelist`. For example: -3. Add the relevant plugins to a Bundler group in your `Gemfile`. An - example: +```yaml +plugins: + - jekyll-gist + - jekyll-coffeescript + - jekyll-seo-tag + - some-other-jekyll-plugin - ```ruby - group :jekyll_plugins do - gem "jekyll-gist" - gem "jekyll-coffeescript" - gem "jekyll-assets" - gem "another-jekyll-plugin" - end - ``` +# Enable safe mode +safe: true - Now you need to install all plugins from your Bundler group by running single command `bundle install`. +# Whitelist plugins under safe mode. +# Note that `some-other-jekyll-plugin` is not listed here. Therefore, +# it will not be loaded under safe mode. +whitelist: + - jekyll-gist + - jekyll-coffeescript + - jekyll-seo-tag +``` + +In the absence of a Gemfile, one must manually ensure that listed plugins have been installed prior to invoking Jekyll. For example, the +latest versions of gems in the above list may be installed to a system-wide location by running: + +```sh +gem install jekyll-gist jekyll-coffeescript jekyll-remote-theme some-other-jekyll-plugin +``` + +## Using a Gemfile + +The maintenance of various gem dependencies may be greatly simplified by using a Gemfile (usually at the root of the site's source) in +conjunction with a Rubygem named `bundler`. The Gemfile however **should** list all the primary dependencies of your site, including Jekyll +itself, not just gem-based plugins of the site because Bundler narrows the scope of installed gems to just *runtime dependencies* resolved by +evaluating the Gemfile. For example: + +```ruby +source "https://rubygems.org" + +# Use the latest version. +gem "jekyll" + +# The theme of current site, locked to a certain version. +gem "minima", "2.4.1" + +# Plugins of this site loaded during a build with proper +# site configuration. +gem "jekyll-gist" +gem "jekyll-coffeescript" +gem "jekyll-seo-tag", "~> 1.5" +gem "some-other-jekyll-plugin" + +# A dependency of a custom-plugin inside `_plugins` directory. +gem "nokogiri", "~> 1.11" +``` + +The gems listed in the Gemfile can be collectively installed by simply running `bundle install`. + +### The `:jekyll_plugins` Gemfile group +{: #the-jekyll_plugins-group} + +Jekyll gives a special treatment to gems listed as part of the `:jekyll_plugins` group in a Gemfile. Any gem under this group is loaded at +the very beginning of any Jekyll process, irrespective of the `--safe` CLI flag or entries in the configuration file(s). + +While this route allows one to enhance Jekyll's CLI with additional subcommands and options, or avoid having to list gems in the configuration +file, the downside is the necessity to be mindful of what gems are included in the group. For example: + +```ruby +source "https://rubygems.org" + +# Use the latest version. +gem "jekyll" + +# The theme of current site, locked to a certain version. +gem "minima", "2.4.1" + +# Plugins of this site loaded only if configured correctly. +gem "jekyll-gist" +gem "jekyll-coffeescript" + +# Gems loaded irrespective of site configuration. +group :jekyll_plugins do + gem "jekyll-cli-plus" + gem "jekyll-seo-tag", "~> 1.5" + gem "some-other-jekyll-plugin" +end +```
Plugins on GitHub Pages

- GitHub Pages is powered by Jekyll. - All Pages sites are generated using the --safe option - to disable plugins (with the exception of some - whitelisted plugins) for - security reasons. Unfortunately, this means - your plugins won’t work if you’re deploying to GitHub Pages.

- You can still use GitHub Pages to publish your site, but you’ll need to - convert the site locally and push the generated static files to your GitHub - repository instead of the Jekyll source files. + GitHub Pages is powered by Jekyll. All GitHub Pages sites are generated using the + --safe option to disable plugins (with the exception of some + whitelisted plugins) for security reasons. Unfortunately, this means your plugins won't + work if you’re deploying via GitHub Pages.

+ You can still use GitHub Pages to publish your site, but you’ll need to build the site locally and push the generated files to your + GitHub repository instead of the Jekyll source files.

- _plugins, _config.yml and Gemfile - can be used simultaneously + _plugins, _config.yml and Gemfile can be used simultaneously

- You may use any of the aforementioned plugin options simultaneously in the - same site if you so choose. Use of one does not restrict the use of the - others. + You may use any of the aforementioned plugin routes simultaneously in the same site if you so choose. + Use of one does not restrict the use of the others.

- -### The jekyll_plugins group - -Jekyll gives this particular group of gems in your `Gemfile` a different -treatment. Any gem included in this group is loaded before Jekyll starts -processing the rest of your source directory. - -A gem included here will be activated even if its not explicitly listed under -the `plugins:` key in your site's config file. - -{: .note .warning} -Gems included in the :jekyll-plugins group are activated -regardless of the --safe mode setting. Be aware of which -gems are included under this group! From ba07bb3648f3d237503363ef8594f63688f79a51 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 6 Jan 2022 10:16:02 -0500 Subject: [PATCH 004/290] Update history to reflect merge of #8921 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 6074c78009b..8ceba94c284 100644 --- a/History.markdown +++ b/History.markdown @@ -48,6 +48,7 @@ * docs: add Layer0 deployment guide (#8915) * docs: Update REAMDE generated by `jekyll new-theme` (#8919) * Update resources.md (#8925) + * Rewrite documentation on installing plugins (#8921) ### Bug Fixes From 7b7a286b4a5a06d651e53836cc598455b27d1b95 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Fri, 7 Jan 2022 11:26:29 +0530 Subject: [PATCH 005/290] Adjust line-length in doc on releasing versions [skip ci] --- .../maintaining/releasing-a-new-version.md | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/docs/_docs/maintaining/releasing-a-new-version.md b/docs/_docs/maintaining/releasing-a-new-version.md index 25f0ea20b72..bee1b933344 100644 --- a/docs/_docs/maintaining/releasing-a-new-version.md +++ b/docs/_docs/maintaining/releasing-a-new-version.md @@ -5,7 +5,9 @@ title: "Releasing a new version" **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone. {: .note .info} -The most important thing to understand before making a release is that there's no need to feel nervous. Most things are revertable, and even if you do publish an incomplete gem version, we can always skip that one. Don't hesitate to contact the other maintainers if you feel unsure or don't know what to do next. +The most important thing to understand before making a release is that there's no need to feel nervous. Most things are revertable, and even if +you do publish an incomplete gem version, we can always skip that one. Don't hesitate to contact the other maintainers if you feel unsure or +don't know what to do next. ### Bump the version @@ -16,11 +18,11 @@ The only important place you need to manually bump the version is in `lib/jekyll Replace the first header of the history document with a version milestone. This looks like the following: ```diff --## HEAD -+## 3.7.1 / 2018-01-25 +- ## HEAD ++ ## 3.7.1 / 2018-01-25 ``` -Adjust the version number and the date. The `## HEAD` heading will be regenerated next time a pull request is merged. +Adjust the version number and the date. The `## HEAD` heading will be regenerated the next time a pull request is merged. Once you've done this, update the website by running the following command: @@ -30,7 +32,8 @@ bundle exec rake site:generate This updates the website's changelog, and pushes the versions in various other places. -It's recommended that you go over the `History.markdown` file manually one more time, in case there are any spelling errors or such. Feel free to fix those manually, and after you're done generating the website changelog, commit your changes. +It's recommended that you go over the `History.markdown` file manually one more time, in case there are any spelling errors or such. Feel free +to fix those manually, and after you're done generating the website changelog, commit your changes. ## Write a release post @@ -40,7 +43,8 @@ In case this isn't done already, you can generate a new release post using the i bundle exec rake site:releases:new[3.8.0] ``` -where `3.8.0` should be replaced with the new version. Then, write the post. Be sure to thank all of the collaborators and maintainers who have contributed since the last release. You can generate a log of their names using the following command: +where `3.8.0` should be replaced with the new version. Then, write the post. Be sure to thank all of the collaborators and maintainers who have +contributed since the last release. You can generate a log of their names using the following command: ```sh git shortlog -sn master...v3.7.2 @@ -63,19 +67,20 @@ Really the only thing left to do is to run this command: bundle exec rake release ``` -This will automatically build the new gem, make a release commit and tag and then push the new gem to RubyGems. Don't worry about creating a GitHub release, @jekyllbot should take care of that. +This will automatically build the new gem, make a release commit and tag and then push the new gem to RubyGems. Don't worry about creating a +GitHub release, @jekyllbot should take care of that. And then, you're done! :tada: Feel free to celebrate! -If you have access to the [@jekyllrb](https://twitter.com/jekyllrb) Twitter account, you should tweet the release post from there. If not, just ask another maintainer to do it or to give you access. +If you have access to the [@jekyllrb](https://twitter.com/jekyllrb) Twitter account, you should tweet the release post from there. If not, just +ask another maintainer to do it or to give you access. ### Build the docs We package our documentation as a :gem: Gem for offline use. This is done with the -[**jekyll-docs**](https://github.com/jekyll/jekyll-docs#building) repository, -and more detailed instructions are provided there. +[**jekyll-docs**](https://github.com/jekyll/jekyll-docs#building) repository, and more detailed instructions are provided there. ## For non-core gems From d4a4d951c5cdb5ea2ee71de6060456bfd37816cd Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sat, 8 Jan 2022 21:12:31 +0530 Subject: [PATCH 006/290] Improve maintainers guide on releasing a new version (#8928) Merge pull request 8928 --- .../maintaining/releasing-a-new-version.md | 128 ++++++++++++++---- 1 file changed, 98 insertions(+), 30 deletions(-) diff --git a/docs/_docs/maintaining/releasing-a-new-version.md b/docs/_docs/maintaining/releasing-a-new-version.md index bee1b933344..1d8c34713bf 100644 --- a/docs/_docs/maintaining/releasing-a-new-version.md +++ b/docs/_docs/maintaining/releasing-a-new-version.md @@ -2,7 +2,8 @@ title: "Releasing a new version" --- -**This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone. +**This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the +contributions of others. You may find what is written here interesting, but it's definitely not for everyone. {: .note .info} The most important thing to understand before making a release is that there's no need to feel nervous. Most things are revertable, and even if @@ -13,9 +14,54 @@ don't know what to do next. The only important place you need to manually bump the version is in `lib/jekyll/version.rb`. Adjust that, and everything else should work fine. -### Update the history document +The version will mostly be of the format `"major.minor.patch"`. At times, we may decide to ship pre-releases which will be in the format +`"major.minor.patch.suffix"`. `suffix` is not standardized and may be anything like `pre.alpha1`, `pre.rc2`, or simply `beta3`, etc. -Replace the first header of the history document with a version milestone. This looks like the following: +To determine the correct version, consult the `## HEAD` section of our history document, `History.markdown`, first. + +- If there's a subsection titled `Major Enhancements` + - Increment the `major` component of the version string and reset both `minor` and `patch` components to `0`. + - Add `suffix` if applicable. + - For example, `"3.9.1" => "4.0.0"` or, `"3.9.1 => "4.0.0.alpha1"`. + - Skip to next step in the release process. + +- If there's a subsection titled `Minor Enhancements` + - Increment just the `minor` component and reset the patch component to `0`. + - Add `suffix` if applicable. + - For example, `"4.0.2" => "4.1.0"` or `"4.1.0" => "4.2.0.pre"`. + - Skip to next step in the release process. + +- For anything else, increment just the `patch` component or `suffix` component as applicable. For example, `"4.0.2" => "4.0.3"` or + `"4.1.0.beta3" => "4.1.0.rc"`. + +### Write a release post + +In case this wasn't done already, you can generate a new release post scaffold using the included `rake` command: + +```sh +bundle exec rake site:releases:new[3.8.0] +``` + +where `3.8.0` should be replaced with the new version. + +Then, write the post. Be sure to thank all of the collaborators and maintainers who have contributed since the last release. You can generate +a log of their names using the following command: + +```sh +git shortlog -sn master...v3.7.2 +``` + +where `v3.7.2` is the git tag for the previous release. In case the tag doesn't exist in your repository, run: + +```sh +git pull +``` + +Be sure to open a pull request for your release post once its finished. + +### Update the History document + +Replace the first header of `History.markdown` with a version milestone. This looks like the following: ```diff - ## HEAD @@ -24,53 +70,73 @@ Replace the first header of the history document with a version milestone. This Adjust the version number and the date. The `## HEAD` heading will be regenerated the next time a pull request is merged. -Once you've done this, update the website by running the following command: +Rearrange the subsections (as a whole) based on decreasing priorities as illustrated below: -```sh -bundle exec rake site:generate ``` +## 4.2.0 / 2020-12-14 -This updates the website's changelog, and pushes the versions in various other places. +### Major Enhancements -It's recommended that you go over the `History.markdown` file manually one more time, in case there are any spelling errors or such. Feel free -to fix those manually, and after you're done generating the website changelog, commit your changes. +... -## Write a release post +### Minor Enhancements -In case this isn't done already, you can generate a new release post using the included `rake` command: +... -```sh -bundle exec rake site:releases:new[3.8.0] +### Bug Fixes + +... + +### Security Fixes + +... + +### Optimization Fixes + +... + +### Development Fixes + +... + +### Site Enhancements + +... ``` -where `3.8.0` should be replaced with the new version. Then, write the post. Be sure to thank all of the collaborators and maintainers who have -contributed since the last release. You can generate a log of their names using the following command: +Once you've done this, update the website by running the following command: ```sh -git shortlog -sn master...v3.7.2 +bundle exec rake site:generate ``` -where, again `v3.7.2` is the last release. Be sure to open a pull request for your release post. +This updates the website's changelog, and pushes the versions in various other places. + +It's recommended that you go over the `History.markdown` file manually one more time, in case there are any spelling errors or such. Feel free +to fix those manually, and after you're done generating the website changelog, commit your changes. ### Push the version Before you do this step, make sure the following things are done: -- You have permission to push a new gem version to RubyGems -- You're logged into RubyGems on your command line -- A release post has been prepared, and is ideally already live -- All of the prior steps are done, committed, and pushed to `master` +- A release post has been prepared, and is ideally already live via a prior pull request. +- All of the prior steps are done, especially the change to `lib/jekyll/version.rb` has been staged for commit. +- Commit staged changes to the local `master` branch preferably with commit message `"Release :gem: v[CURRENT_VERSION]"`. -Really the only thing left to do is to run this command: +The only thing left to do now is to run this command: ```sh -bundle exec rake release +git push upstream master ``` -This will automatically build the new gem, make a release commit and tag and then push the new gem to RubyGems. Don't worry about creating a -GitHub release, @jekyllbot should take care of that. +where `upstream` references `git@github.com:jekyll/jekyll.git`. + +This will trigger a GitHub Actions workflow that will automatically build the new gem, tag the release commit, push the tag to GitHub and +then finally, push the new gem to RubyGems. Don't worry about creating a GitHub release either, @jekyllbot will take care of that when the +release workflow publishes the new tag. -And then, you're done! :tada: Feel free to celebrate! +And then, if the workflow has completed successfully, you're done! :tada: +Feel free to celebrate! If you have access to the [@jekyllrb](https://twitter.com/jekyllrb) Twitter account, you should tweet the release post from there. If not, just ask another maintainer to do it or to give you access. @@ -79,16 +145,18 @@ ask another maintainer to do it or to give you access. We package our documentation as a :gem: Gem for offline use. -This is done with the -[**jekyll-docs**](https://github.com/jekyll/jekyll-docs#building) repository, and more detailed instructions are provided there. +This is done with the [**jekyll-docs**](https://github.com/jekyll/jekyll-docs#building) repository, and more detailed instructions are +provided there. ## For non-core gems -If you're not a maintainer for `jekyll/jekyll`, the procedure is much simpler in a lot of cases. Generally, the procedure still looks like this: +If you're not a maintainer for `jekyll/jekyll`, the procedure is much simpler in a lot of cases. Generally, the procedure still looks like +this: - Bump the gem version manually, usually in `lib//version.rb` - Adjust the history file -- Run `bundle exec rake release` or `script/release`, depending on which of the two exists +- Commit changes to default branch preferably with message `"Release :gem: v[CURRENT_VERSION]"` +- Push to remote repository - Rejoice Be sure to ask your project's maintainers if you're unsure! From e3cbe584f2a78141bf7f53cfef8cf237b3f4c201 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sat, 8 Jan 2022 10:42:33 -0500 Subject: [PATCH 007/290] Update history to reflect merge of #8928 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 8ceba94c284..0dc2ccb5027 100644 --- a/History.markdown +++ b/History.markdown @@ -49,6 +49,7 @@ * docs: Update REAMDE generated by `jekyll new-theme` (#8919) * Update resources.md (#8925) * Rewrite documentation on installing plugins (#8921) + * Improve maintainers guide on releasing a new version (#8928) ### Bug Fixes From 8578d735bcc9e003903c4eec83cc2743faab253f Mon Sep 17 00:00:00 2001 From: Korbs <51213244+KorbsStudio@users.noreply.github.com> Date: Fri, 14 Jan 2022 10:30:04 -0500 Subject: [PATCH 008/290] Fix link for "CloudSh" (#8934) Merge pull request 8934 --- docs/pages/resources.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pages/resources.md b/docs/pages/resources.md index a5ee9e95924..543dc81b804 100644 --- a/docs/pages/resources.md +++ b/docs/pages/resources.md @@ -69,7 +69,7 @@ Use a SaaS service as a backend for functionality on your Jekyll site - [Algolia](https://blog.algolia.com/instant-search-blog-documentation-jekyll-plugin/): Add a powerful instant search to your Jekyll site - [Elastic Site Search](http://elastic.co/products/site-search/service?ultron=resources&blade=jekyll&hulk=referral): Another option for adding search to your Jekyll site, built on Elasticsearch - [Bonsai Search](https://docs.bonsai.io/article/217-jekyll): The easiest way to use Elasticsearch for your Jekyll site - - [CloudSh](https://cloudsh.com/generators/How-to-setup-search-on-Jekyll/): Website search with a few lines of JavaScript + - [CloudSh](https://cloudsh.com/generators/how-to-setup-search-on-jekyll/): Website search with a few lines of JavaScript ## Editors plugins From 9fac4c6ec71626bd9bb595c53d6ce674fefa0a83 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 14 Jan 2022 10:30:06 -0500 Subject: [PATCH 009/290] Update history to reflect merge of #8934 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 0dc2ccb5027..0ffb6bd5475 100644 --- a/History.markdown +++ b/History.markdown @@ -50,6 +50,7 @@ * Update resources.md (#8925) * Rewrite documentation on installing plugins (#8921) * Improve maintainers guide on releasing a new version (#8928) + * Fix link for "CloudSh" (#8934) ### Bug Fixes From 4ec6902cdbd907339ca6367eac480322dcb14e22 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Wed, 19 Jan 2022 15:39:09 +0530 Subject: [PATCH 010/290] Bump RuboCop to `v1.25.x` Closes #8941 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index adf052641b8..1cf6604c81d 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ group :test do gem "nokogiri", "~> 1.7" gem "rspec" gem "rspec-mocks" - gem "rubocop", "~> 1.24.0" + gem "rubocop", "~> 1.25.0" gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rake" From 07cd645ce679309953387dd4bce93bdca19f3edb Mon Sep 17 00:00:00 2001 From: Parker Moore <237985+parkr@users.noreply.github.com> Date: Thu, 20 Jan 2022 18:50:49 -0800 Subject: [PATCH 011/290] Run vendor-mimes to update mime.types (#8940) Merge pull request 8940 --- lib/jekyll/mime.types | 154 +++++++++++++++++++++++------------------- script/vendor-mimes | 4 +- 2 files changed, 85 insertions(+), 73 deletions(-) diff --git a/lib/jekyll/mime.types b/lib/jekyll/mime.types index 4aad695e385..0a03f010892 100644 --- a/lib/jekyll/mime.types +++ b/lib/jekyll/mime.types @@ -21,6 +21,7 @@ application/cdmi-object cdmio application/cdmi-queue cdmiq application/cu-seeme cu application/dash+xml mpd +application/dash-patch+xml mpp application/davmount+xml davmount application/docbook+xml dbk application/dssc+der dssc @@ -30,6 +31,7 @@ application/emma+xml emma application/emotionml+xml emotionml application/epub+zip epub application/exi exi +application/express exp application/fdt+xml fdt application/font-tdpfr pfr application/geo+json geojson @@ -42,7 +44,7 @@ application/hyperstudio stk application/inkml+xml ink inkml application/ipfix ipfix application/its+xml its -application/java-archive jar war ear +application/java-archive ear jar war application/java-serialized-object ser application/java-vm class application/javascript js mjs @@ -58,7 +60,7 @@ application/mads+xml mads application/manifest+json webmanifest application/marc mrc application/marcxml+xml mrcx -application/mathematica ma nb mb +application/mathematica ma mb nb application/mathml+xml mathml application/mbox mbox application/mediaservercontrol+xml mscml @@ -69,19 +71,18 @@ application/mmt-aei+xml maei application/mmt-usd+xml musd application/mods+xml mods application/mp21 m21 mp21 -application/mp4 mp4s m4p -application/mrb-consumer+xml xdf +application/mp4 m4p mp4s application/msword doc dot application/mxf mxf application/n-quads nq application/n-triples nt application/node cjs -application/octet-stream bin dms lrf mar so dist distz pkg bpk dump elc deploy exe dll deb dmg iso img msi msp msm buffer +application/octet-stream bin bpk buffer deb deploy dist distz dll dmg dms dump elc exe img iso lrf mar msi msm msp pkg so application/oda oda application/oebps-package+xml opf application/ogg ogx application/omdoc+xml omdoc -application/onenote onetoc onetoc2 onetmp onepkg +application/onenote onepkg onetmp onetoc onetoc2 application/oxps oxps application/p2p-overlay+xml relo application/patch-ops-error+xml xer @@ -90,7 +91,7 @@ application/pgp-encrypted pgp application/pgp-signature asc sig application/pics-rules prf application/pkcs10 p10 -application/pkcs7-mime p7m p7c +application/pkcs7-mime p7c p7m application/pkcs7-signature p7s application/pkcs8 p8 application/pkix-attr-cert ac @@ -104,7 +105,7 @@ application/provenance+xml provx application/prs.cww cww application/pskc+xml pskcxml application/raml+yaml raml -application/rdf+xml rdf owl +application/rdf+xml owl rdf application/reginfo+xml rif application/relax-ng-compact-syntax rnc application/resource-lists+xml rl @@ -130,7 +131,7 @@ application/sensml+xml sensml application/set-payment-initiation setpay application/set-registration-initiation setreg application/shf+xml shf -application/sieve siv sieve +application/sieve sieve siv application/smil+xml smi smil application/sparql-query rq application/sparql-results+xml srx @@ -144,6 +145,7 @@ application/tei+xml tei te application/thraud+xml tfi application/timestamped-data tsd application/toml toml +application/trig trig application/ttml+xml ttml application/ubjson ubj application/urc-ressheet+xml rsheet @@ -157,12 +159,13 @@ application/vnd.3m.post-it-notes pwn application/vnd.accpac.simply.aso aso application/vnd.accpac.simply.imp imp application/vnd.acucobol acu -application/vnd.acucorp atc acutc +application/vnd.acucorp acutc atc application/vnd.adobe.air-application-installer-package+zip air application/vnd.adobe.formscentral.fcdt fcdt application/vnd.adobe.fxp fxp fxpl application/vnd.adobe.xdp+xml xdp application/vnd.adobe.xfdf xfdf +application/vnd.age age application/vnd.ahead.space ahead application/vnd.airzip.filesecure.azf azf application/vnd.airzip.filesecure.azs azs @@ -192,7 +195,7 @@ application/vnd.cinderella cdy application/vnd.citationstyles.style+xml csl application/vnd.claymore cla application/vnd.cloanto.rp9 rp9 -application/vnd.clonk.c4group c4g c4d c4f c4p c4u +application/vnd.clonk.c4group c4d c4f c4g c4p c4u application/vnd.cluetrust.cartomobile-config c11amc application/vnd.cluetrust.cartomobile-config-pkg c11amz application/vnd.commonspace csp @@ -211,10 +214,10 @@ application/vnd.curl.pcurl pcurl application/vnd.dart dart application/vnd.data-vision.rdz rdz application/vnd.dbf dbf -application/vnd.dece.data uvf uvvf uvd uvvd +application/vnd.dece.data uvd uvf uvvd uvvf application/vnd.dece.ttml+xml uvt uvvt -application/vnd.dece.unspecified uvx uvvx -application/vnd.dece.zip uvz uvvz +application/vnd.dece.unspecified uvvx uvx +application/vnd.dece.zip uvvz uvz application/vnd.denovo.fcselayout-link fe_launch application/vnd.dna dna application/vnd.dolby.mlp mlp @@ -236,10 +239,10 @@ application/vnd.ezpix-album ez2 application/vnd.ezpix-package ez3 application/vnd.fdf fdf application/vnd.fdsn.mseed mseed -application/vnd.fdsn.seed seed dataless +application/vnd.fdsn.seed dataless seed application/vnd.flographit gph application/vnd.fluxtime.clip ftc -application/vnd.framemaker fm frame maker book +application/vnd.framemaker book fm frame maker application/vnd.frogans.fnc fnc application/vnd.frogans.ltf ltf application/vnd.fsc.weblaunch fsc @@ -285,7 +288,7 @@ application/vnd.hp-pcl pcl application/vnd.hp-pclxl pclxl application/vnd.hydrostatix.sof-data sfd-hdstx application/vnd.ibm.minipay mpy -application/vnd.ibm.modcap afp listafp list3820 +application/vnd.ibm.modcap afp list3820 listafp application/vnd.ibm.rights-management irm application/vnd.ibm.secure-container sc application/vnd.iccprofile icc icm @@ -305,7 +308,7 @@ application/vnd.jam jam application/vnd.jcp.javame.midlet-rms rms application/vnd.jisp jisp application/vnd.joost.joda-archive joda -application/vnd.kahootz ktz ktr +application/vnd.kahootz ktr ktz application/vnd.kde.karbon karbon application/vnd.kde.kchart chrt application/vnd.kde.kformula kfo @@ -317,7 +320,7 @@ application/vnd.kde.kword kwd kw application/vnd.kenameaapp htke application/vnd.kidspiration kia application/vnd.kinar kne knp -application/vnd.koan skp skd skt skm +application/vnd.koan skd skm skp skt application/vnd.kodak-descriptor sse application/vnd.las.las+xml lasxml application/vnd.llamagraphics.life-balance.desktop lbd @@ -330,6 +333,7 @@ application/vnd.lotus-organizer org application/vnd.lotus-screencam scm application/vnd.lotus-wordpro lwp application/vnd.macports.portpkg portpkg +application/vnd.mapbox-vector-tile mvt application/vnd.mcd mcd application/vnd.medcalcdata mc1 application/vnd.mediastation.cdkey cdkey @@ -350,7 +354,7 @@ application/vnd.mophun.certificate mpc application/vnd.mozilla.xul+xml xul application/vnd.ms-artgalry cil application/vnd.ms-cab-compressed cab -application/vnd.ms-excel xls xlm xla xlc xlt xlw +application/vnd.ms-excel xla xlc xlm xls xlt xlw application/vnd.ms-excel.addin.macroenabled.12 xlam application/vnd.ms-excel.sheet.binary.macroenabled.12 xlsb application/vnd.ms-excel.sheet.macroenabled.12 xlsm @@ -363,16 +367,16 @@ application/vnd.ms-officetheme thmx application/vnd.ms-outlook msg application/vnd.ms-pki.seccat cat application/vnd.ms-pki.stl stl -application/vnd.ms-powerpoint ppt pps pot +application/vnd.ms-powerpoint pot pps ppt application/vnd.ms-powerpoint.addin.macroenabled.12 ppam application/vnd.ms-powerpoint.presentation.macroenabled.12 pptm application/vnd.ms-powerpoint.slide.macroenabled.12 sldm application/vnd.ms-powerpoint.slideshow.macroenabled.12 ppsm application/vnd.ms-powerpoint.template.macroenabled.12 potm -application/vnd.ms-project mpp mpt +application/vnd.ms-project mpt application/vnd.ms-word.document.macroenabled.12 docm application/vnd.ms-word.template.macroenabled.12 dotm -application/vnd.ms-works wps wks wcm wdb +application/vnd.ms-works wcm wdb wks wps application/vnd.ms-wpl wpl application/vnd.ms-xpsdocument xps application/vnd.mseq mseq @@ -380,7 +384,7 @@ application/vnd.musician mus application/vnd.muvee.style msty application/vnd.mynfc taglet application/vnd.neurolanguage.nlu nlu -application/vnd.nitf ntf nitf +application/vnd.nitf nitf ntf application/vnd.noblenet-directory nnd application/vnd.noblenet-sealer nns application/vnd.noblenet-web nnw @@ -424,7 +428,7 @@ application/vnd.openxmlformats-officedocument.wordprocessingml.template dotx application/vnd.osgeo.mapguide.package mgp application/vnd.osgi.dp dp application/vnd.osgi.subsystem esa -application/vnd.palm pdb pqa oprc +application/vnd.palm oprc pdb pqa application/vnd.pawaafile paw application/vnd.pg.format str application/vnd.pg.osasli ei6 @@ -436,7 +440,7 @@ application/vnd.previewsystems.box box application/vnd.proteus.magazine mgz application/vnd.publishare-delta-tree qps application/vnd.pvi.ptid1 ptid -application/vnd.quark.quarkxpress qxd qxt qwd qwt qxl qxb +application/vnd.quark.quarkxpress qwd qwt qxb qxd qxl qxt application/vnd.rar rar application/vnd.realvnc.bed bed application/vnd.recordare.musicxml mxl @@ -459,7 +463,7 @@ application/vnd.simtech-mindmapper twd tw application/vnd.smaf mmf application/vnd.smart.teacher teacher application/vnd.software602.filler.form+xml fo -application/vnd.solent.sdkm+xml sdkm sdkd +application/vnd.solent.sdkm+xml sdkd sdkm application/vnd.spotfire.dxp dxp application/vnd.spotfire.sfs sfs application/vnd.stardivision.calc sdc @@ -489,7 +493,7 @@ application/vnd.syncml.dm+wbxml bdm application/vnd.syncml.dm+xml xdm application/vnd.syncml.dmddf+xml ddf application/vnd.tao.intent-module-archive tao -application/vnd.tcpdump.pcap pcap cap dmp +application/vnd.tcpdump.pcap cap dmp pcap application/vnd.tmobile-livetv tmo application/vnd.trid.tpt tpt application/vnd.triscape.mxs mxs @@ -500,7 +504,7 @@ application/vnd.umajin umj application/vnd.unity unityweb application/vnd.uoml+xml uoml application/vnd.vcx vcx -application/vnd.visio vsd vst vss vsw +application/vnd.visio vsd vss vst vsw application/vnd.visionary vis application/vnd.vsf vsf application/vnd.wap.wbxml wbxml @@ -533,15 +537,15 @@ application/x-7z-compressed 7z application/x-abiword abw application/x-ace-compressed ace application/x-arj arj -application/x-authorware-bin aab x32 u32 vox +application/x-authorware-bin aab u32 vox x32 application/x-authorware-map aam application/x-authorware-seg aas application/x-bcpio bcpio application/x-bittorrent torrent application/x-blorb blb blorb application/x-bzip bz -application/x-bzip2 bz2 boz -application/x-cbr cbr cba cbt cbz cb7 +application/x-bzip2 boz bz2 +application/x-cbr cb7 cba cbr cbt cbz application/x-cdlink vcd application/x-cfs-compressed cfs application/x-chat chat @@ -553,7 +557,7 @@ application/x-cpio cpio application/x-csh csh application/x-debian-package udeb application/x-dgc-compressed dgc -application/x-director dir dcr dxr cst cct cxt w3d fgd swa +application/x-director cct cst cxt dcr dir dxr fgd swa w3d application/x-doom wad application/x-dtbncx+xml ncx application/x-dtbook+xml dtb @@ -566,7 +570,7 @@ application/x-font-ghostscript gsf application/x-font-linux-psf psf application/x-font-pcf pcf application/x-font-snf snf -application/x-font-type1 pfa pfb pfm afm +application/x-font-type1 afm pfa pfb pfm application/x-freearc arc application/x-futuresplash spl application/x-gca-compressed gca @@ -582,10 +586,10 @@ application/x-java-jnlp-file jnlp application/x-keepass2 kdbx application/x-latex latex application/x-lua-bytecode luac -application/x-lzh-compressed lzh lha +application/x-lzh-compressed lha lzh application/x-makeself run application/x-mie mie -application/x-mobipocket-ebook prc mobi +application/x-mobipocket-ebook mobi prc application/x-ms-application application application/x-ms-shortcut lnk application/x-ms-wmd wmd @@ -595,15 +599,15 @@ application/x-msaccess mdb application/x-msbinder obd application/x-mscardfile crd application/x-msclip clp -application/x-msdownload com bat -application/x-msmediaview mvb m13 m14 -application/x-msmetafile wmf emf emz +application/x-msdownload bat com +application/x-msmediaview m13 m14 mvb +application/x-msmetafile emf emz wmf application/x-msmoney mny application/x-mspublisher pub application/x-msschedule scd application/x-msterminal trm application/x-mswrite wri -application/x-netcdf nc cdf +application/x-netcdf cdf nc application/x-ns-proxy-autoconfig pac application/x-nzb nzb application/x-perl pl pm @@ -629,7 +633,7 @@ application/x-tar tar application/x-tcl tcl tk application/x-tex tex application/x-tex-tfm tfm -application/x-texinfo texinfo texi +application/x-texinfo texi texinfo application/x-tgif obj application/x-ustar ustar application/x-virtualbox-hdd hdd @@ -642,7 +646,7 @@ application/x-virtualbox-vhd vhd application/x-virtualbox-vmdk vmdk application/x-wais-source src application/x-web-app-manifest+json webapp -application/x-x509-ca-cert der crt pem +application/x-x509-ca-cert crt der pem application/x-xfig fig application/x-xliff+xml xlf application/x-xpinstall xpi @@ -651,29 +655,31 @@ application/x-zmachine z1 z2 application/xaml+xml xaml application/xcap-att+xml xav application/xcap-caps+xml xca +application/xcap-diff+xml xdf application/xcap-el+xml xel application/xcap-ns+xml xns application/xenc+xml xenc -application/xhtml+xml xhtml xht -application/xml xml xsl xsd rng +application/xhtml+xml xht xhtml +application/xml rng xml xsd xsl application/xml-dtd dtd application/xop+xml xop application/xproc+xml xpl application/xslt+xml xslt application/xspf+xml xspf -application/xv+xml mxml xhvml xvml xvm +application/xv+xml mxml xhvml xvm xvml application/yang yang application/yin+xml yin application/zip zip audio/3gpp 3gpp audio/adpcm adp +audio/amr amr audio/basic au snd -audio/midi mid midi kar rmi +audio/midi kar mid midi rmi audio/mobile-xmf mxmf audio/mp3 mp3 audio/mp4 m4a mp4a -audio/mpeg mpga mp2 mp2a m2a m3a -audio/ogg oga ogg spx opus +audio/mpeg m2a m3a mp2 mp2a mpga +audio/ogg oga ogg opus spx audio/s3m s3m audio/silk sil audio/vnd.dece.audio uva uvva @@ -690,14 +696,14 @@ audio/vnd.rip rip audio/wav wav audio/webm weba audio/x-aac aac -audio/x-aiff aif aiff aifc +audio/x-aiff aif aifc aiff audio/x-caf caf audio/x-flac flac audio/x-matroska mka audio/x-mpegurl m3u audio/x-ms-wax wax audio/x-ms-wma wma -audio/x-pn-realaudio ram ra +audio/x-pn-realaudio ra ram audio/x-pn-realaudio-plugin rmp audio/xm xm chemical/x-cdx cdx @@ -729,11 +735,11 @@ image/hsj2 hsj2 image/ief ief image/jls jls image/jp2 jp2 jpg2 -image/jpeg jpeg jpg jpe +image/jpeg jpe jpeg jpg image/jph jph image/jphc jhc image/jpm jpm -image/jpx jpx jpf +image/jpx jpf jpx image/jxr jxr image/jxra jxra image/jxrs jxrs @@ -753,8 +759,8 @@ image/tiff tif ti image/tiff-fx tfx image/vnd.adobe.photoshop psd image/vnd.airzip.accelerator.azv azv -image/vnd.dece.graphic uvi uvvi uvg uvvg -image/vnd.djvu djvu djv +image/vnd.dece.graphic uvg uvi uvvg uvvi +image/vnd.djvu djv djvu image/vnd.dvb.subtitle sub image/vnd.dwg dwg image/vnd.dxf dxf @@ -778,10 +784,10 @@ image/webp webp image/x-3ds 3ds image/x-cmu-raster ras image/x-cmx cmx -image/x-freehand fh fhc fh4 fh5 fh7 +image/x-freehand fh fh4 fh5 fh7 fhc image/x-jng jng image/x-mrsid-image sid -image/x-pict pic pct +image/x-pict pct pic image/x-portable-anymap pnm image/x-portable-bitmap pbm image/x-portable-graymap pgm @@ -801,9 +807,12 @@ message/vnd.wfa.wsc wsc model/3mf 3mf model/gltf+json gltf model/gltf-binary glb -model/iges igs iges -model/mesh msh mesh silo +model/iges iges igs +model/mesh mesh msh silo model/mtl mtl +model/step+xml stpx +model/step+zip stpz +model/step-xml+zip stpxz model/vnd.collada+xml dae model/vnd.dwf dwf model/vnd.gdl gdl @@ -812,10 +821,11 @@ model/vnd.mts mts model/vnd.opengex ogex model/vnd.parasolid.transmit.binary x_b model/vnd.parasolid.transmit.text x_t +model/vnd.sap.vds vds model/vnd.usdz+zip usdz model/vnd.valve.source.compiled-map bsp model/vnd.vtu vtu -model/vrml wrl vrml +model/vrml vrml wrl model/x3d+binary x3db x3dbz model/x3d+vrml x3dv x3dvz model/x3d+xml x3d x3dz @@ -824,7 +834,7 @@ text/calendar ics if text/coffeescript coffee litcoffee text/css css text/csv csv -text/html html htm shtml +text/html htm html shtml text/jade jade text/jsx jsx text/less less @@ -832,16 +842,16 @@ text/markdown markdo text/mathml mml text/mdx mdx text/n3 n3 -text/plain txt text conf def list log in ini +text/plain conf def in ini list log text txt text/prs.lines.tag dsc text/richtext rtx -text/sgml sgml sgm +text/sgml sgm sgml text/shex shex text/slim slim slm text/spdx spdx -text/stylus stylus styl +text/stylus styl stylus text/tab-separated-values tsv -text/troff t tr roff man me ms +text/troff man me ms roff t tr text/turtle ttl text/uri-list uri uris urls text/vcard vcard @@ -849,6 +859,7 @@ text/vnd.curl curl text/vnd.curl.dcurl dcurl text/vnd.curl.mcurl mcurl text/vnd.curl.scurl scurl +text/vnd.familysearch.gedcom ged text/vnd.fly fly text/vnd.fmi.flexstor flx text/vnd.graphviz gv @@ -858,10 +869,10 @@ text/vnd.sun.j2me.app-descriptor jad text/vnd.wap.wml wml text/vnd.wap.wmlscript wmls text/vtt vtt -text/x-asm s asm -text/x-c c cc cxx cpp h hh dic +text/x-asm asm s +text/x-c c cc cpp cxx dic h hh text/x-component htc -text/x-fortran f for f77 f90 +text/x-fortran f f77 f90 for text/x-handlebars-template hbs text/x-java-source java text/x-lua lua @@ -884,14 +895,15 @@ video/3gpp2 3g2 video/h261 h261 video/h263 h263 video/h264 h264 +video/iso.segment m4s video/jpeg jpgv video/jpm jpgm video/mj2 mj2 mjp2 video/mp2t ts video/mp4 mp4 mp4v mpg4 -video/mpeg mpeg mpg mpe m1v m2v +video/mpeg m1v m2v mpe mpeg mpg video/ogg ogv -video/quicktime qt mov +video/quicktime mov qt video/vnd.dece.hd uvh uvvh video/vnd.dece.mobile uvm uvvm video/vnd.dece.pd uvp uvvp @@ -899,7 +911,7 @@ video/vnd.dece.sd uvs uv video/vnd.dece.video uvv uvvv video/vnd.dvb.file dvb video/vnd.fvt fvt -video/vnd.mpegurl mxu m4u +video/vnd.mpegurl m4u mxu video/vnd.ms-playready.media.pyv pyv video/vnd.uvvu.mp4 uvu uvvu video/vnd.vivo viv @@ -908,7 +920,7 @@ video/x-f4v f4v video/x-fli fli video/x-flv flv video/x-m4v m4v -video/x-matroska mkv mk3d mks +video/x-matroska mk3d mks mkv video/x-mng mng video/x-ms-asf asf asx video/x-ms-vob vob diff --git a/script/vendor-mimes b/script/vendor-mimes index 6ea9c377a64..4a240f70d02 100755 --- a/script/vendor-mimes +++ b/script/vendor-mimes @@ -9,7 +9,7 @@ config = File.expand_path "../lib/jekyll/mime.types", __dir__ # Create an array of vendored mimetype => [extensions] mimes = {} -json = open('https://raw.githubusercontent.com/jshttp/mime-db/master/db.json').read +json = URI.open('https://raw.githubusercontent.com/jshttp/mime-db/master/db.json').read data = JSON.parse(json) data.reject! { |mime, meta| meta["extensions"].nil? || meta["extensions"].empty? } data.each do |mime, meta| @@ -30,6 +30,6 @@ output = "" output << "# Woah there. Do not edit this file directly.\n" output << "# This file is generated automatically by script/vendor-mimes.\n\n" mimes = mimes.sort_by { |k,v| k } -output << mimes.map { |mime,extensions| "#{mime.ljust(strlen)} #{extensions.join(" ")}" }.join("\n") +output << mimes.map { |mime,extensions| "#{mime.ljust(strlen)} #{extensions.sort.join(" ")}" }.join("\n") File.write(config, output) From 1306cd7be936333332618e7c2be9a2b8f89efad6 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 20 Jan 2022 21:50:50 -0500 Subject: [PATCH 012/290] Update history to reflect merge of #8940 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 0ffb6bd5475..24dc9a05904 100644 --- a/History.markdown +++ b/History.markdown @@ -92,6 +92,7 @@ * Remove the warning about auto-regeneration on Windows (#8821) * Propagate _data folder from theme (#8815) * Support both tzinfo v1 and v2 alongwith non-half hour offsets. (#8880) + * Run vendor-mimes to update mime.types (#8940) ### Site Enhancements From e133183f6fae3ea884121782be25fface68c980d Mon Sep 17 00:00:00 2001 From: Attaphong Rattanaveerachanon Date: Fri, 28 Jan 2022 16:22:00 +0700 Subject: [PATCH 013/290] Update document for github-actions workflow by adding cache step. (#8948) Merge pull request 8948 --- docs/_docs/continuous-integration/github-actions.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/_docs/continuous-integration/github-actions.md b/docs/_docs/continuous-integration/github-actions.md index ade090eeda7..e5513bdf66b 100644 --- a/docs/_docs/continuous-integration/github-actions.md +++ b/docs/_docs/continuous-integration/github-actions.md @@ -113,6 +113,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: actions/cache@v2 + with: + path: vendor/bundle + key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile') }} + restore-keys: | + ${{ runner.os }}-gems- - uses: helaili/jekyll-action@v2 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -126,6 +132,7 @@ The above workflow can be explained as the following: the Action from overwriting the `gh-pages` branch on any feature branch pushes. - The **name** of the job matches our YAML filename: `github-pages`. - The **checkout** action takes care of cloning your repository. +- The **cache** action is an optimisation for shorten the build times. - We specify our selected **action** and **version number** using `helaili/jekyll-action@2.0.5`. This handles the build and deploy. - We set a reference to a secret **environment variable** for the action to use. The `GITHUB_TOKEN` From 5dcfc22cbad97465997e1f030a4cfc24b6837249 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 28 Jan 2022 04:22:01 -0500 Subject: [PATCH 014/290] Update history to reflect merge of #8948 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 24dc9a05904..d00de36fe3e 100644 --- a/History.markdown +++ b/History.markdown @@ -51,6 +51,7 @@ * Rewrite documentation on installing plugins (#8921) * Improve maintainers guide on releasing a new version (#8928) * Fix link for "CloudSh" (#8934) + * Recommend using `actions/cache` in GitHub Actions documentation (#8948) ### Bug Fixes From a3290166dc11ccb5f3c95bd9f10fca876d5f4994 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Fri, 28 Jan 2022 15:06:02 +0530 Subject: [PATCH 015/290] Improve note on use of `actions/cache` [skip ci] --- docs/_docs/continuous-integration/github-actions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_docs/continuous-integration/github-actions.md b/docs/_docs/continuous-integration/github-actions.md index e5513bdf66b..25ce27a12f6 100644 --- a/docs/_docs/continuous-integration/github-actions.md +++ b/docs/_docs/continuous-integration/github-actions.md @@ -132,7 +132,7 @@ The above workflow can be explained as the following: the Action from overwriting the `gh-pages` branch on any feature branch pushes. - The **name** of the job matches our YAML filename: `github-pages`. - The **checkout** action takes care of cloning your repository. -- The **cache** action is an optimisation for shorten the build times. +- The **cache** action is an optimization to avoid fetching and installing gems on every build. - We specify our selected **action** and **version number** using `helaili/jekyll-action@2.0.5`. This handles the build and deploy. - We set a reference to a secret **environment variable** for the action to use. The `GITHUB_TOKEN` From 285f79306b496ce646841908ae4f90220e33d7ae Mon Sep 17 00:00:00 2001 From: Robert Martin Date: Mon, 31 Jan 2022 09:21:44 -0600 Subject: [PATCH 016/290] Update bug_report.yml (#8951) Merge pull request 8951 --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 9c4db1e16e8..766e2b725a5 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -53,7 +53,7 @@ body: If yes, then we need to know the `github-pages` version used by your project. Proceed ahead otherwise. If you're using the `github-pages` gem in your Gemfile, paste the output from running the following: ``` - bundle exec github-pges -v + bundle exec github-pages -v ``` Otherwise, enter `Latest` in the input field and proceed ahead. - type: textarea From 92c6dc6578d1b67a3cc7b13bd5a691f9201ae518 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 31 Jan 2022 10:21:45 -0500 Subject: [PATCH 017/290] Update history to reflect merge of #8951 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index d00de36fe3e..50a5f28cbf6 100644 --- a/History.markdown +++ b/History.markdown @@ -82,6 +82,7 @@ * Add a workflow to build gems consistently (#8830) * Fix random test failures in TestExcerpt #to_liquid (#8884) * Lock gem `psych` to `v3.x` (#8918) + * Fix typo in Bug Report template (#8951) ### Minor Enhancements From c644d9a5686ff86358d6a6fccdcee6ed2740ffc1 Mon Sep 17 00:00:00 2001 From: Tyler887 Date: Mon, 31 Jan 2022 16:19:04 +0000 Subject: [PATCH 018/290] Hakiri sunsetting down (#8946) Merge pull request 8946 --- README.markdown | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.markdown b/README.markdown index 26e3a3a907b..7698dfb8683 100644 --- a/README.markdown +++ b/README.markdown @@ -3,12 +3,10 @@ [![Gem Version](https://img.shields.io/gem/v/jekyll.svg)][ruby-gems] [![Linux Build Status](https://github.com/jekyll/jekyll/workflows/Continuous%20Integration/badge.svg)][ci-workflow] [![Windows Build status](https://img.shields.io/appveyor/ci/jekyll/jekyll/master.svg?label=Windows%20build)][appveyor] -[![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)][hakiri] [![Backers on Open Collective](https://opencollective.com/jekyll/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/jekyll/sponsors/badge.svg)](#sponsors) [ruby-gems]: https://rubygems.org/gems/jekyll -[hakiri]: https://hakiri.io/github/jekyll/jekyll/master [ci-workflow]: https://github.com/jekyll/jekyll/actions?query=workflow%3A%22Continuous+Integration%22+branch%3Amaster [appveyor]: https://ci.appveyor.com/project/jekyll/jekyll/branch/master From d46bef774a8f91e7f58d982cccdface7a3d5d26b Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 31 Jan 2022 11:19:07 -0500 Subject: [PATCH 019/290] Update history to reflect merge of #8946 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 50a5f28cbf6..01bca470d1c 100644 --- a/History.markdown +++ b/History.markdown @@ -52,6 +52,7 @@ * Improve maintainers guide on releasing a new version (#8928) * Fix link for "CloudSh" (#8934) * Recommend using `actions/cache` in GitHub Actions documentation (#8948) + * Remove references to EOL hakiri.io service (#8946) ### Bug Fixes From 88044a2ecec2854602e8b67d2b05dc576b6d3a05 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 10 Feb 2022 08:59:01 +0530 Subject: [PATCH 020/290] Fix deprecation message for missing doc method (#8960) Merge pull request 8960 --- features/post_data.feature | 32 ++++++++++++++++++++++++++++++++ lib/jekyll/document.rb | 5 ++--- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/features/post_data.feature b/features/post_data.feature index aee7f3fd189..cdfe07b7956 100644 --- a/features/post_data.feature +++ b/features/post_data.feature @@ -382,3 +382,35 @@ Scenario: Use page.render_with_liquid variable And the _site directory should exist And I should see "next post: Some like it hot" in "_site/2009/03/27/star-wars.html" And I should see "Previous post: Some like it hot" in "_site/2009/05/27/terminator.html" + + Scenario: Deprecate calling data keys directly via Ruby + Given I have a _posts directory + And I have a _plugins directory + And I have the following post: + | title | date | content | + | My post | 2016-01-21 | Luke, I am your father. | + And I have a "_plugins/foo.rb" file with content: + """ + Jekyll::Hooks.register :documents, :pre_render do |doc| + doc.title + end + """ + And I have a "_plugins/bar.rb" file with content: + """ + module FooBar + def self.dummy?(doc) + doc.title == "Dummy Document" + end + end + + Jekyll::Hooks.register :documents, :post_render do |doc| + FooBar.dummy?(doc) + end + """ + When I run jekyll build + Then I should get a zero exit status + And the _site directory should exist + And I should see "Deprecation: Document#title" in the build output + And I should see "_plugins/foo.rb:2" in the build output + And I should see "_plugins/bar.rb:3" in the build output + But I should not see "lib/jekyll/document.rb" in the build output diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index e5c19a10c9f..2e39024e74b 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -406,9 +406,8 @@ def related_posts # Override of method_missing to check in @data for the key. def method_missing(method, *args, &blck) if data.key?(method.to_s) - Jekyll::Deprecator.deprecation_message "Document##{method} is now a key "\ - "in the #data hash." - Jekyll::Deprecator.deprecation_message "Called by #{caller(0..0)}." + Jekyll::Deprecator.deprecation_message "Document##{method} is now a key in the #data hash." + Jekyll.logger.warn "", "Called by #{caller(1..1)[0]}." data[method.to_s] else super From 86907653ca56337df16193107913cada40e28c5f Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 9 Feb 2022 19:29:03 -0800 Subject: [PATCH 021/290] Update history to reflect merge of #8960 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 01bca470d1c..403921facfa 100644 --- a/History.markdown +++ b/History.markdown @@ -65,6 +65,7 @@ * Fix regression in Convertible module from v4.2.0 (#8786) * Revert #7253: "Don't reset site.url to localhost:4000 by default" (#8620) * Improve readability of CI logs (#8877) + * Fix deprecation message for missing doc method (#8960) ### Development Fixes From 034d3e9f4b443c4575881511597b15fa0e6e40eb Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sat, 26 Feb 2022 02:42:23 +0530 Subject: [PATCH 022/290] Fix response header for content served via `jekyll serve` (#8965) Merge pull request 8965 --- lib/jekyll/commands/serve.rb | 5 ++ .../commands/serve/mime_types_charset.json | 71 +++++++++++++++++++ lib/jekyll/commands/serve/servlet.rb | 18 +++-- lib/jekyll/mime.types | 8 ++- script/vendor-mimes | 50 +++++++++++-- test/helper.rb | 1 + 6 files changed, 141 insertions(+), 12 deletions(-) create mode 100644 lib/jekyll/commands/serve/mime_types_charset.json diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index 7357b9398bf..7467977dd6c 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -194,6 +194,7 @@ def webrick_opts(opts) :JekyllOptions => opts, :DoNotReverseLookup => true, :MimeTypes => mime_types, + :MimeTypesCharset => mime_types_charset, :DocumentRoot => opts["destination"], :StartCallback => start_callback(opts["detach"]), :StopCallback => stop_callback(opts["detach"]), @@ -353,6 +354,10 @@ def mime_types WEBrick::HTTPUtils.load_mime_types(file) end + def mime_types_charset + SafeYAML.load_file(File.expand_path("serve/mime_types_charset.json", __dir__)) + end + def read_file(source_dir, file_path) File.read(Jekyll.sanitized_path(source_dir, file_path)) end diff --git a/lib/jekyll/commands/serve/mime_types_charset.json b/lib/jekyll/commands/serve/mime_types_charset.json new file mode 100644 index 00000000000..017469b9ccd --- /dev/null +++ b/lib/jekyll/commands/serve/mime_types_charset.json @@ -0,0 +1,71 @@ +{ + "application/javascript": "UTF-8", + "application/json": "UTF-8", + "application/manifest+json": "UTF-8", + "application/vnd.syncml+xml": "UTF-8", + "application/vnd.syncml.dm+wbxml": "UTF-8", + "application/vnd.syncml.dm+xml": "UTF-8", + "application/vnd.syncml.dmddf+xml": "UTF-8", + "application/vnd.wap.wbxml": "UTF-8", + "text/cache-manifest": "UTF-8", + "text/calendar": "UTF-8", + "text/coffeescript": "UTF-8", + "text/css": "UTF-8", + "text/csv": "UTF-8", + "text/html": "UTF-8", + "text/jade": "UTF-8", + "text/jsx": "UTF-8", + "text/less": "UTF-8", + "text/markdown": "UTF-8", + "text/mathml": "UTF-8", + "text/mdx": "UTF-8", + "text/n3": "UTF-8", + "text/plain": "UTF-8", + "text/prs.lines.tag": "UTF-8", + "text/richtext": "UTF-8", + "text/sgml": "UTF-8", + "text/shex": "UTF-8", + "text/slim": "UTF-8", + "text/spdx": "UTF-8", + "text/stylus": "UTF-8", + "text/tab-separated-values": "UTF-8", + "text/troff": "UTF-8", + "text/turtle": "UTF-8", + "text/uri-list": "UTF-8", + "text/vcard": "UTF-8", + "text/vnd.curl": "UTF-8", + "text/vnd.curl.dcurl": "UTF-8", + "text/vnd.curl.mcurl": "UTF-8", + "text/vnd.curl.scurl": "UTF-8", + "text/vnd.familysearch.gedcom": "UTF-8", + "text/vnd.fly": "UTF-8", + "text/vnd.fmi.flexstor": "UTF-8", + "text/vnd.graphviz": "UTF-8", + "text/vnd.in3d.3dml": "UTF-8", + "text/vnd.in3d.spot": "UTF-8", + "text/vnd.sun.j2me.app-descriptor": "UTF-8", + "text/vnd.wap.wml": "UTF-8", + "text/vnd.wap.wmlscript": "UTF-8", + "text/vtt": "UTF-8", + "text/x-asm": "UTF-8", + "text/x-c": "UTF-8", + "text/x-component": "UTF-8", + "text/x-fortran": "UTF-8", + "text/x-handlebars-template": "UTF-8", + "text/x-java-source": "UTF-8", + "text/x-lua": "UTF-8", + "text/x-markdown": "UTF-8", + "text/x-nfo": "UTF-8", + "text/x-opml": "UTF-8", + "text/x-pascal": "UTF-8", + "text/x-processing": "UTF-8", + "text/x-sass": "UTF-8", + "text/x-scss": "UTF-8", + "text/x-setext": "UTF-8", + "text/x-sfv": "UTF-8", + "text/x-suse-ymp": "UTF-8", + "text/x-uuencode": "UTF-8", + "text/x-vcalendar": "UTF-8", + "text/x-vcard": "UTF-8", + "text/yaml": "UTF-8" +} diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb index cee9c663a8a..d91f871f656 100644 --- a/lib/jekyll/commands/serve/servlet.rb +++ b/lib/jekyll/commands/serve/servlet.rb @@ -134,6 +134,7 @@ class Servlet < WEBrick::HTTPServlet::FileHandler def initialize(server, root, callbacks) # So we can access them easily. @jekyll_opts = server.config[:JekyllOptions] + @mime_types_charset = server.config[:MimeTypesCharset] set_defaults super end @@ -173,7 +174,7 @@ def do_GET(req, res) end end - validate_and_ensure_charset(req, res) + conditionally_inject_charset(res) res.header.merge!(@headers) rtn end @@ -181,13 +182,16 @@ def do_GET(req, res) private - def validate_and_ensure_charset(_req, res) - key = res.header.keys.grep(%r!content-type!i).first - typ = res.header[key] + # Inject charset based on Jekyll config only if our mime-types database contains + # the charset metadata. + # + # Refer `script/vendor-mimes` in the repository for further details. + def conditionally_inject_charset(res) + typ = res.header["content-type"] + return unless @mime_types_charset.key?(typ) + return if %r!;\s*charset=!.match?(typ) - unless %r!;\s*charset=!.match?(typ) - res.header[key] = "#{typ}; charset=#{@jekyll_opts["encoding"]}" - end + res.header["content-type"] = "#{typ}; charset=#{@jekyll_opts["encoding"]}" end def set_defaults diff --git a/lib/jekyll/mime.types b/lib/jekyll/mime.types index 0a03f010892..10f713c6ed7 100644 --- a/lib/jekyll/mime.types +++ b/lib/jekyll/mime.types @@ -19,6 +19,7 @@ application/cdmi-container cdmic application/cdmi-domain cdmid application/cdmi-object cdmio application/cdmi-queue cdmiq +application/cpl+xml cpl application/cu-seeme cu application/dash+xml mpd application/dash-patch+xml mpp @@ -63,6 +64,7 @@ application/marcxml+xml mrcx application/mathematica ma mb nb application/mathml+xml mathml application/mbox mbox +application/media-policy-dataset+xml mpf application/mediaservercontrol+xml mscml application/metalink+xml metalink application/metalink4+xml meta4 @@ -88,7 +90,8 @@ application/p2p-overlay+xml relo application/patch-ops-error+xml xer application/pdf pdf application/pgp-encrypted pgp -application/pgp-signature asc sig +application/pgp-keys asc +application/pgp-signature sig application/pics-rules prf application/pkcs10 p10 application/pkcs7-mime p7c p7m @@ -529,6 +532,7 @@ application/vnd.zul zir zi application/vnd.zzazz.deck+xml zaz application/voicexml+xml vxml application/wasm wasm +application/watcherinfo+xml wif application/widget wgt application/winhlp hlp application/wsdl+xml wsdl @@ -719,6 +723,8 @@ font/woff woff font/woff2 woff2 image/aces exr image/apng apng +image/avci avci +image/avcs avcs image/avif avif image/bmp bmp image/cgm cgm diff --git a/script/vendor-mimes b/script/vendor-mimes index 4a240f70d02..0242d5395e1 100755 --- a/script/vendor-mimes +++ b/script/vendor-mimes @@ -2,16 +2,41 @@ # Vendors the MIME type config from the mime-db list # usage: script/vendor-mimes +require 'colorator' require 'json' require 'open-uri' -config = File.expand_path "../lib/jekyll/mime.types", __dir__ +# ---- Helpers ---- -# Create an array of vendored mimetype => [extensions] -mimes = {} -json = URI.open('https://raw.githubusercontent.com/jshttp/mime-db/master/db.json').read +{ + :info => :cyan, + :success => :green, + :error => :red, +}.each do |type, color| + define_method("log_#{type}") do |msg| + puts " #{msg}".send(color) + end +end + +# ---- + +json = begin + log_info "Reading remote data.." + URI.open("https://raw.githubusercontent.com/jshttp/mime-db/master/db.json").read +rescue StandardError => e + log_error "Error reading remote data!" + log_error e.message + log_error "Aborting." + exit 1 +end + +log_info "Parsing remote data.." data = JSON.parse(json) data.reject! { |mime, meta| meta["extensions"].nil? || meta["extensions"].empty? } + +log_info "Generating interim mime data-hashes.." +mimes = {} +charset_data = {} data.each do |mime, meta| # Normalize extensions and mime-types mime = mime.downcase.strip @@ -23,8 +48,15 @@ data.each do |mime, meta| next if extensions.empty? mimes[mime] = [] if mimes[mime].nil? mimes[mime].concat extensions + + # Extract mime-types with "charset" metadata + charset_data[mime] = meta["charset"] if meta.key?("charset") + + # Assign `UTF-8` charset for mime-types under the `text` domain if not already assigned upstream + charset_data[mime] ||= "UTF-8" if mime.start_with?("text/") end +log_info "Formatting primary hash and writing to file.." strlen = mimes.keys.max_by(&:length).length output = "" output << "# Woah there. Do not edit this file directly.\n" @@ -32,4 +64,14 @@ output << "# This file is generated automatically by script/vendor-mimes.\n\n" mimes = mimes.sort_by { |k,v| k } output << mimes.map { |mime,extensions| "#{mime.ljust(strlen)} #{extensions.sort.join(" ")}" }.join("\n") +config = File.expand_path "../lib/jekyll/mime.types", __dir__ File.write(config, output) +log_info "Done! See: #{config.inspect.white}" + +# --- Generate JSON file from charset_data ---- +puts + +log_info "Dumping mimetype-charset mapping as JSON.." +json_file = File.expand_path "../lib/jekyll/commands/serve/mime_types_charset.json", __dir__ +File.write(json_file, JSON.pretty_generate(charset_data) + "\n") +log_success "and done! See: #{json_file.inspect.white}" diff --git a/test/helper.rb b/test/helper.rb index 90adacc1571..c40adcbad96 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -245,6 +245,7 @@ def config :ServerType => Thread, :Logger => WEBrick::Log.new(logger), :AccessLog => [[logger, ""]], + :MimeTypesCharset => Jekyll::Commands::Serve.send(:mime_types_charset), :JekyllOptions => {}, } end From e27088555d30ab1a4bd7af9364ffad0acbf63bde Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 25 Feb 2022 13:12:25 -0800 Subject: [PATCH 023/290] Update history to reflect merge of #8965 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 403921facfa..c25a6bd3660 100644 --- a/History.markdown +++ b/History.markdown @@ -66,6 +66,7 @@ * Revert #7253: "Don't reset site.url to localhost:4000 by default" (#8620) * Improve readability of CI logs (#8877) * Fix deprecation message for missing doc method (#8960) + * Fix response header for content served via `jekyll serve` (#8965) ### Development Fixes From 493ed1571e79651e31c2f1e6c9bd671827c7326e Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 3 Mar 2022 16:21:14 +0530 Subject: [PATCH 024/290] Release post for v4.2.2 (#8982) Merge pull request 8982 --- .../2022-03-03-jekyll-4-2-2-released.markdown | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 docs/_posts/2022-03-03-jekyll-4-2-2-released.markdown diff --git a/docs/_posts/2022-03-03-jekyll-4-2-2-released.markdown b/docs/_posts/2022-03-03-jekyll-4-2-2-released.markdown new file mode 100644 index 00000000000..d175aa2027e --- /dev/null +++ b/docs/_posts/2022-03-03-jekyll-4-2-2-released.markdown @@ -0,0 +1,30 @@ +--- +title: "Jekyll 4.2.2 Released" +date: 2022-03-03 19:15:20 +0530 +author: ashmaroli +version: 4.2.2 +category: release +--- + +Hello Jekyllers! + +Jekyll 4.2.2 has been released. Unlike prior releases, this is a simple maintenance release and may be skipped. + +For those who are still curious about the current release, here is some technical context: The previous `jekyll-4.2.1` package was built and +published using a Windows system. A side-effect of that action was that every file bundled into the gem ended up with Windows-style CRLF +line-endings instead of Unix-style LF line-endings. + +For our end-users, this difference holds no significance. However, a third-party entity vendoring the release faced a roadblock. The executable +program `jekyll` apparently misplaced the executable bit because of the change in line-endings. + +To that end, the Jekyll team decided to use the GitHub Actions service to build and publish releases. In-house plugins have already published +releases via this route serving as trials. Henceforth, and unless explicitly reported, all Jekyll releases will be built on GitHub Actions' +Ubuntu platform and published to Rubygems by @jekyllbot irrespective of the maintainer overseeing the release. + +That is all for now. +Happy Jekyllin'!! + +*P.S.: Jekyll 4.3.0 will be bringing you some new features very soon.. Also, our sass-converter plugin has been [enhanced][sass-220] to support +modern improvements to Sass.* + +[sass-220]: https://github.com/jekyll/jekyll-sass-converter/tree/v2.2.0#sass-embedded From 3d5bed24e2e45acaafb3d14ad68b8d322635e319 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 3 Mar 2022 02:51:16 -0800 Subject: [PATCH 025/290] Update history to reflect merge of #8982 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index c25a6bd3660..f8112207a9d 100644 --- a/History.markdown +++ b/History.markdown @@ -53,6 +53,7 @@ * Fix link for "CloudSh" (#8934) * Recommend using `actions/cache` in GitHub Actions documentation (#8948) * Remove references to EOL hakiri.io service (#8946) + * Release post for v4.2.2 (#8982) ### Bug Fixes From 0faa2a4c122347d423313a9665f755359a854a71 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 3 Mar 2022 16:31:14 +0530 Subject: [PATCH 026/290] Release :gem: v4.2.2 --- History.markdown | 11 +++++++++++ docs/_config.yml | 2 +- docs/_docs/history.md | 15 +++++++++++++++ docs/latest_version.txt | 2 +- lib/jekyll/version.rb | 2 +- 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/History.markdown b/History.markdown index f8112207a9d..c37aa3ec297 100644 --- a/History.markdown +++ b/History.markdown @@ -105,6 +105,17 @@ * Improvements to CSS (#7834) * Slightly update lang `sh` code-block styling (#8857) +## 4.2.2 / 2022-03-03 + +### Bug Fixes + + * Lock `http_parser.rb` gem to `v0.6.x` on JRuby. + +### Development Fixes + + * Backport #8830 for v4.2.x: Add a workflow to build gems consistently (#8869) + * Lock `rubocop-performance` to `v1.11.x`. + ## 4.2.1 / 2021-09-27 ### Bug Fixes diff --git a/docs/_config.yml b/docs/_config.yml index 4fe4dbceaba..a86191a3608 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,5 +1,5 @@ --- -version: 4.2.1 +version: 4.2.2 name: Jekyll • Simple, blog-aware, static sites description: Transform your plain text into static websites and blogs url: https://jekyllrb.com diff --git a/docs/_docs/history.md b/docs/_docs/history.md index d377478c7ea..fbcc1aa3411 100644 --- a/docs/_docs/history.md +++ b/docs/_docs/history.md @@ -4,6 +4,21 @@ permalink: "/docs/history/" note: This file is autogenerated. Edit /History.markdown instead. --- +## 4.2.2 / 2022-03-03 +{: #v4-2-2} + +### Bug Fixes +{: #bug-fixes-v4-2-2} + +- Lock `http_parser.rb` gem to `v0.6.x` on JRuby. + +### Development Fixes +{: #development-fixes-v4-2-2} + +- Backport [#8830]({{ site.repository }}/issues/8830) for v4.2.x: Add a workflow to build gems consistently ([#8869]({{ site.repository }}/issues/8869)) +- Lock `rubocop-performance` to `v1.11.x`. + + ## 4.2.1 / 2021-09-27 {: #v4-2-1} diff --git a/docs/latest_version.txt b/docs/latest_version.txt index fae6e3d04b2..af8c8ec7c13 100644 --- a/docs/latest_version.txt +++ b/docs/latest_version.txt @@ -1 +1 @@ -4.2.1 +4.2.2 diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index f6cd7eddf47..5a1c19d2d26 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Jekyll - VERSION = "4.2.1" + VERSION = "4.2.2" end From 36cbca0ece3a2dfb59ba7ed99508cf90ee15b257 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Fri, 4 Mar 2022 21:36:27 +0530 Subject: [PATCH 027/290] Document releasing off `*-stable` branches (#8984) Merge pull request 8984 --- docs/_docs/maintaining/index.md | 1 + .../releasing-off-stable-branches.md | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 docs/_docs/maintaining/releasing-off-stable-branches.md diff --git a/docs/_docs/maintaining/index.md b/docs/_docs/maintaining/index.md index 1d517ce47cd..e7a1b607d50 100644 --- a/docs/_docs/maintaining/index.md +++ b/docs/_docs/maintaining/index.md @@ -15,6 +15,7 @@ Hello! This is where we document various processes for maintaining Jekyll. Being - [Avoiding burnout](avoiding-burnout/) - [Special Labels](special-labels/) - [Releasing a new version](releasing-a-new-version/) +- [Releasing a new version off `*-stable` branches](releasing-off-stable-branches/) Interested in becoming a maintainer? Here is some documentation for **contributors**: diff --git a/docs/_docs/maintaining/releasing-off-stable-branches.md b/docs/_docs/maintaining/releasing-off-stable-branches.md new file mode 100644 index 00000000000..1fa16fa4971 --- /dev/null +++ b/docs/_docs/maintaining/releasing-off-stable-branches.md @@ -0,0 +1,63 @@ +--- +title: Releasing off older stable branches +--- + +Apart from having releases cut from the default `master` branch, Jekyll Core may occasionally cut releases containing security patches and +critical bug-fixes for older versions under maintenance. Such releases are cut from specially named branches, following the pattern +`[x].[y]-stable` where `[x]` denotes semver-major-version and `[y]`, the semver-minor-version. For example, the branch `3.9-stable` refers to +commits released as part of `jekyll-3.9.x` series. + +Co-ordinating a release off a `*-stable` branch is complicated mainly because the default branch has to inevitably reflect the release as well. + +## Requirements + +- The maintainer has to have **write-access** to both the concerned `*-stable` and `master` branches. +- The maintainer needs to complete the task using their **local CLI program** instead of dispatching via GitHub Web UI. +- The maintainer is abreast with the workflow to [release off `master`]({{ 'docs/maintaining/releasing-a-new-version/' | relative_url }}). The + procedure documented in the following section is an abridged adaptation of the workflow for `master`. +- A release post has been drafted and **is awaiting publish to `master`** via an approved pull request. +- Stable internet connection. + +## Trigger release workflow + +1. Ensure that you've **checked out the concerned `*-stable` branch** and is up-to-date with its counterpart at `jekyll/jekyll` at GitHub. +2. Bump the `VERSION` string in `lib/jekyll/version.rb`. +3. Update the **History document** as documented [here]({{ 'docs/maintaining/releasing-a-new-version/#update-the-history-document' | relative_url }}).
+ (**IMPORTANT: Do not run `rake site:generate` on the stable branch though**). +4. Copy the entire History section pertaining to current release and paste into a new tab / window of your text-editor. We will use this + temporary snippet at a future stage. +5. Commit changes to the version-file and History document with commit message `Release :gem: v[CURRENT_VERSION]`. +6. Push commit to upstream remote `jekyll/jekyll` at GitHub. + +## Publish release post + +1. Ensure the `Release Gem` workflow has completed successfully. +2. Merge release-post pull request to `master`. + +## Update default branch to reflect release off the stable branch + +1. Locally, check out `master` and ensure it is up-to-date with its remote counterpart at `jekyll/jekyll` at GitHub. +2. Update History document using the snippet in the temporary tab / window created earlier. The various sections in the History document are + primarily in reverse chronological order and secondarily scoped to the semver-major-version. For example, a release section for `v3.9.2` + will be listed above the section for `v3.9.1` but under release sections for v4.x. + The snippet stashed earlier has to be injected into the correct location manually. +3. Optionally, update `VERSION` string in `lib/jekyll/version.rb`. (*If existing version is lesser than latest version*). +4. Now **run `rake site:generate`** to update various meta files: + - docs/_config.yml + - docs/_docs/history.md + - docs/latest_version.txt +5. Commit changes to various meta files with commit message `Release :gem: v[CURRENT_VERSION]`. +6. Push commit to upstream remote. + +## Publish GitHub Release + +Unlike releases cut off the `master` branch, our JekyllBot does not automatically create and publish a GitHub Release for tags created from +*non-default* branches. Therefore, the maintainer has to **manually create and publish** the concerned GitHub Release. +1. Choose the newly pushed tag. +2. Title is same as the name of the selected tag. +3. The release snippet stashed previously forms the body. +4. Delete the snippet's title (`## x.y.z / YYYY-MM-DD`) from the release body. +5. Publish. + +Note: The GitHub Release may optionally be *drafted* prior to updating the default branch and then *published* immediately after pushing the +update commit to the default branch to streamline the procedure. From b7056373afc65935a073bddadfe70606b622ffa6 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 4 Mar 2022 08:06:29 -0800 Subject: [PATCH 028/290] Update history to reflect merge of #8984 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index c37aa3ec297..884c9d10565 100644 --- a/History.markdown +++ b/History.markdown @@ -54,6 +54,7 @@ * Recommend using `actions/cache` in GitHub Actions documentation (#8948) * Remove references to EOL hakiri.io service (#8946) * Release post for v4.2.2 (#8982) + * Document releasing off `*-stable` branches (#8984) ### Bug Fixes From 380c3fe815a7475ede8b4b75f211ff5c081949fc Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Wed, 9 Mar 2022 22:33:28 +0530 Subject: [PATCH 029/290] Bump RuboCop to `v1.26.x` --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 1cf6604c81d..2145b28b4c9 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ group :test do gem "nokogiri", "~> 1.7" gem "rspec" gem "rspec-mocks" - gem "rubocop", "~> 1.25.0" + gem "rubocop", "~> 1.26.0" gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rake" From 06abe7fd0cfb0937a943272ed6ea7876f4152080 Mon Sep 17 00:00:00 2001 From: Gary Date: Thu, 10 Mar 2022 01:05:58 +0800 Subject: [PATCH 030/290] Update document by fix yaml syntax error (#8991) Merge pull request 8991 --- docs/_docs/continuous-integration/github-actions.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/_docs/continuous-integration/github-actions.md b/docs/_docs/continuous-integration/github-actions.md index 25ce27a12f6..acf8afb169b 100644 --- a/docs/_docs/continuous-integration/github-actions.md +++ b/docs/_docs/continuous-integration/github-actions.md @@ -114,11 +114,11 @@ jobs: steps: - uses: actions/checkout@v2 - uses: actions/cache@v2 - with: - path: vendor/bundle - key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile') }} - restore-keys: | - ${{ runner.os }}-gems- + with: + path: vendor/bundle + key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile') }} + restore-keys: | + ${{ runner.os }}-gems- - uses: helaili/jekyll-action@v2 with: token: ${{ secrets.GITHUB_TOKEN }} From 62d9c8c30c150afb2fe5afc635b837dfd7f31fdd Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 9 Mar 2022 09:06:00 -0800 Subject: [PATCH 031/290] Update history to reflect merge of #8991 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 884c9d10565..786ade06819 100644 --- a/History.markdown +++ b/History.markdown @@ -55,6 +55,7 @@ * Remove references to EOL hakiri.io service (#8946) * Release post for v4.2.2 (#8982) * Document releasing off `*-stable` branches (#8984) + * Update document by fix yaml syntax error (#8991) ### Bug Fixes From f48d500586318fe7a82e992dfb336496ffd289a5 Mon Sep 17 00:00:00 2001 From: Emily Grace Seville Date: Fri, 11 Mar 2022 20:00:27 +1000 Subject: [PATCH 032/290] Enhace option's case for Jekyll configuration (#8992) Merge pull request 8992 --- docs/_data/config_options/build.yml | 10 +++++----- docs/_data/config_options/global.yml | 8 ++++---- docs/_data/config_options/serve.yml | 18 +++++++++--------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/_data/config_options/build.yml b/docs/_data/config_options/build.yml index be71f5c80d3..c740ecbbac5 100644 --- a/docs/_data/config_options/build.yml +++ b/docs/_data/config_options/build.yml @@ -55,7 +55,7 @@ flag: --lsi -- name: Limit Posts +- name: Limit posts description: Limit the number of posts to parse and publish. option: "limit_posts: NUM" flag: --limit_posts NUM @@ -72,12 +72,12 @@ flag: -V, --verbose -- name: Silence Output +- name: Silence output description: Silence the normal output from Jekyll during a build. flag: -q, --quiet -- name: Log Level +- name: Log level description: Specify a log level among debug, info, warn, or error. flag: JEKYLL_LOG_LEVEL=info @@ -93,7 +93,7 @@ flag: -I, --incremental -- name: Disable Bundle Require +- name: Disable bundle require description: Disables the need to require gems in `:jekyll_plugins` Gemfile flag: JEKYLL_NO_BUNDLER_REQUIRE=true @@ -104,7 +104,7 @@ flag: --profile -- name: Strict Front Matter +- name: Strict front matter description: Cause a build to fail if there is a YAML syntax error in a page's front matter. option: "strict_front_matter: BOOL" flag: --strict_front_matter diff --git a/docs/_data/config_options/global.yml b/docs/_data/config_options/global.yml index 7f7feb3c1e7..406e841ea67 100644 --- a/docs/_data/config_options/global.yml +++ b/docs/_data/config_options/global.yml @@ -1,10 +1,10 @@ -- name: Site Source +- name: Site source description: Change the directory where Jekyll will read files option: "source: DIR" flag: -s, --source DIR -- name: Site Destination +- name: Site destination description: Change the directory where Jekyll will write files option: "destination: DIR" flag: -d, --destination DIR @@ -17,7 +17,7 @@ flag: --safe -- name: Disable Disk Cache +- name: Disable disk cache version-badge: 4.1.0 description: >- Disable caching of content to disk in order to skip creating a .jekyll-cache or similar directory at @@ -57,7 +57,7 @@ option: "keep_files: [DIR, FILE, ...]" -- name: Time Zone +- name: Time zone description: >- Set the time zone for site generation. This sets the TZ environment variable, which Ruby uses to handle time and date creation and manipulation. Any entry from the diff --git a/docs/_data/config_options/serve.yml b/docs/_data/config_options/serve.yml index 8578abe0559..fc2544881c1 100644 --- a/docs/_data/config_options/serve.yml +++ b/docs/_data/config_options/serve.yml @@ -1,28 +1,28 @@ -- name: Local Server Port +- name: Local server port description: Listen on the given port. The default is `4000`. option: "port: PORT" flag: "-P, --port PORT" -- name: Local Server Hostname +- name: Local server hostname description: Listen at the given hostname. The default is `localhost`. option: "host: HOSTNAME" flag: "-H, --host HOSTNAME" -- name: Live Reload +- name: Live reload description: Reload a page automatically on the browser when its content is edited. option: "livereload: BOOL" flag: "-l, --livereload" -- name: Live Reload Ignore +- name: Live reload ignore description: File glob patterns for LiveReload to ignore. option: "livereload_ignore: [ GLOB1,... ]" flag: "--livereload-ignore GLOB1[,GLOB2,...]" -- name: Live Reload Min/Max Delay +- name: Live reload min/max delay description: Minimum/Maximum delay before automatically reloading page. options: - "livereload_min_delay: SECONDS" @@ -32,7 +32,7 @@ - "--livereload-max-delay SECONDS" -- name: Live Reload Port +- name: Live reload port description: Port for LiveReload to listen on. flag: "--livereload-port PORT" @@ -55,17 +55,17 @@ flag: "--skip-initial-build" -- name: Show Directory Listing +- name: Show directory listing description: Show a directory listing instead of loading your index file. option: "show_dir_listing: BOOL" flag: "--show-dir-listing" -- name: X.509 (SSL) Private Key +- name: X.509 (SSL) private key description: "SSL Private Key, stored or symlinked in the site source." flag: "--ssl-key" -- name: X.509 (SSL) Certificate +- name: X.509 (SSL) certificate description: "SSL Public certificate, stored or symlinked in the site source." flag: "--ssl-cert" From de7da5f6c370a2f160ba207cf3a2997102ba814e Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 11 Mar 2022 02:00:28 -0800 Subject: [PATCH 033/290] Update history to reflect merge of #8992 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 786ade06819..d2e9c04b43c 100644 --- a/History.markdown +++ b/History.markdown @@ -56,6 +56,7 @@ * Release post for v4.2.2 (#8982) * Document releasing off `*-stable` branches (#8984) * Update document by fix yaml syntax error (#8991) + * Enhance option's case for Jekyll configuration (#8992) ### Bug Fixes From 88cbd7a783c955a1b27a2b123c6fb07e264408ca Mon Sep 17 00:00:00 2001 From: Nicholas Paxford Date: Mon, 14 Mar 2022 12:02:41 +0100 Subject: [PATCH 034/290] Update manual.md (#8997) Merge pull request 8997 --- docs/_docs/deployment/manual.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_docs/deployment/manual.md b/docs/_docs/deployment/manual.md index be1054a0fbf..b0805c16851 100644 --- a/docs/_docs/deployment/manual.md +++ b/docs/_docs/deployment/manual.md @@ -25,7 +25,7 @@ low-volume blogs as you only pay for what you use. ## FTP -Most traditional web hosting provider let you upload files to their servers over FTP. To upload a Jekyll site to a web host using FTP, run the `jekyll build` command and copy the contents of the generated `_site` folder to the root folder of your hosting account. This is most likely to be the `httpdocs` or `public_html` folder on most hosting providers. +Most traditional web hosting providers let you upload files to their servers over FTP. To upload a Jekyll site to a web host using FTP, run the `jekyll build` command and copy the contents of the generated `_site` folder to the root folder of your hosting account. This is most likely to be the `httpdocs` or `public_html` folder on most hosting providers. ## scp From 62ef1580ec93d0766664c8366aa09b1647f13da9 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 14 Mar 2022 04:02:43 -0700 Subject: [PATCH 035/290] Update history to reflect merge of #8997 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index d2e9c04b43c..353169c8d82 100644 --- a/History.markdown +++ b/History.markdown @@ -57,6 +57,7 @@ * Document releasing off `*-stable` branches (#8984) * Update document by fix yaml syntax error (#8991) * Enhance option's case for Jekyll configuration (#8992) + * Fix typo in `_docs/deployment/manual.md` (#8997) ### Bug Fixes From 6984a649325ea2576375bc690332aba9a9eebfdd Mon Sep 17 00:00:00 2001 From: Emily Grace Seville Date: Fri, 18 Mar 2022 05:25:31 +1000 Subject: [PATCH 036/290] Add quiet/verbose options (#8996) Merge pull request 8996 --- docs/_data/config_options/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/_data/config_options/build.yml b/docs/_data/config_options/build.yml index c740ecbbac5..7f63573f37b 100644 --- a/docs/_data/config_options/build.yml +++ b/docs/_data/config_options/build.yml @@ -69,11 +69,13 @@ - name: Verbose output description: Print verbose output. + option: "verbose: BOOL" flag: -V, --verbose - name: Silence output description: Silence the normal output from Jekyll during a build. + option: "quiet: BOOL" flag: -q, --quiet From e6d3d90b524de02533ba7021e02417d85245f29a Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 17 Mar 2022 12:25:32 -0700 Subject: [PATCH 037/290] Update history to reflect merge of #8996 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 353169c8d82..85c1539088a 100644 --- a/History.markdown +++ b/History.markdown @@ -58,6 +58,7 @@ * Update document by fix yaml syntax error (#8991) * Enhance option's case for Jekyll configuration (#8992) * Fix typo in `_docs/deployment/manual.md` (#8997) + * Add quiet/verbose options (#8996) ### Bug Fixes From 94dc98cb6b66cb414f3b79c8faad0d72f0df6bef Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Mon, 21 Mar 2022 20:30:41 +0530 Subject: [PATCH 038/290] Trigger livereload in sites without pages (#8337) Merge pull request 8337 --- lib/jekyll/commands/serve.rb | 6 +++--- lib/jekyll/commands/serve/live_reload_reactor.rb | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index 7467977dd6c..2bb9c8c1953 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -144,9 +144,9 @@ def register_reload_hooks(opts) @reload_reactor = LiveReloadReactor.new Jekyll::Hooks.register(:site, :post_render) do |site| - regenerator = Jekyll::Regenerator.new(site) - @changed_pages = site.pages.select do |p| - regenerator.regenerate?(p) + @changed_pages = [] + site.each_site_file do |item| + @changed_pages << item if site.regenerator.regenerate?(item) end end diff --git a/lib/jekyll/commands/serve/live_reload_reactor.rb b/lib/jekyll/commands/serve/live_reload_reactor.rb index 6ca34665cb3..e79a876a71e 100644 --- a/lib/jekyll/commands/serve/live_reload_reactor.rb +++ b/lib/jekyll/commands/serve/live_reload_reactor.rb @@ -72,8 +72,7 @@ def reload(pages) :liveCSS => true ) - Jekyll.logger.debug "LiveReload:", "Reloading #{p.url}" - Jekyll.logger.debug "", json_message + Jekyll.logger.debug "LiveReload:", "Reloading URL #{p.url.inspect}" @websockets.each { |ws| ws.send(json_message) } end end From dd0c5fc3bcb7c1c6da5352c7e08813a28021c54c Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 21 Mar 2022 08:00:43 -0700 Subject: [PATCH 039/290] Update history to reflect merge of #8337 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 85c1539088a..26d497f9d6f 100644 --- a/History.markdown +++ b/History.markdown @@ -73,6 +73,7 @@ * Improve readability of CI logs (#8877) * Fix deprecation message for missing doc method (#8960) * Fix response header for content served via `jekyll serve` (#8965) + * Trigger livereload in sites without pages (#8337) ### Development Fixes From 10966484732c0a79505ad437c655f6c5ff179f08 Mon Sep 17 00:00:00 2001 From: "jaybe@jekyll" Date: Wed, 23 Mar 2022 08:39:47 -0500 Subject: [PATCH 040/290] Update README.markdown re IRC Pointer (#9005) Merge pull request 9005 --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 7698dfb8683..edca8e5775c 100644 --- a/README.markdown +++ b/README.markdown @@ -24,7 +24,7 @@ See: [https://jekyllrb.com/philosophy](https://jekyllrb.com/philosophy) * Read up about its [Usage](https://jekyllrb.com/docs/usage/) and [Configuration](https://jekyllrb.com/docs/configuration/) * Take a gander at some existing [Sites](https://github.com/jekyll/jekyll/wiki/sites) * [Fork](https://github.com/jekyll/jekyll/fork) and [Contribute](https://jekyllrb.com/docs/contributing/) your own modifications -* Have questions? Check out our official forum community [Jekyll Talk](https://talk.jekyllrb.com/) or [`#jekyll` on irc.freenode.net](https://botbot.me/freenode/jekyll/) +* Have questions? Check out our official forum community [Jekyll Talk](https://talk.jekyllrb.com/) and [`#jekyll` Channel on Libera IRC](https://libera.chat) ## Diving In From 4194f62dd72fa8f6edc311e48893ba5a9e7cf315 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 23 Mar 2022 06:39:49 -0700 Subject: [PATCH 041/290] Update history to reflect merge of #9005 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 26d497f9d6f..dfe9891a7e2 100644 --- a/History.markdown +++ b/History.markdown @@ -59,6 +59,7 @@ * Enhance option's case for Jekyll configuration (#8992) * Fix typo in `_docs/deployment/manual.md` (#8997) * Add quiet/verbose options (#8996) + * Update README.markdown re IRC Pointer (#9005) ### Bug Fixes From b98db02f36883709d00be25e8ad2fdb2692c61f1 Mon Sep 17 00:00:00 2001 From: lucafrance <62500301+lucafrance@users.noreply.github.com> Date: Thu, 24 Mar 2022 17:03:54 +0100 Subject: [PATCH 042/290] Remove Aerobatic (#9007) Merge pull request 9007 --- docs/_docs/deployment/third-party.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/_docs/deployment/third-party.md b/docs/_docs/deployment/third-party.md index 29e420c2d43..6420cec529d 100644 --- a/docs/_docs/deployment/third-party.md +++ b/docs/_docs/deployment/third-party.md @@ -4,12 +4,6 @@ permalink: /docs/deployment/third-party/ --- -## Aerobatic - -[Aerobatic](https://www.aerobatic.com) has custom domains, global CDN distribution, basic auth, CORS proxying, and a growing list of plugins all included. - -Automating the deployment of a Jekyll site is simple. See their [Jekyll docs](https://www.aerobatic.com/docs/static-site-generators/#jekyll) for more details. Your built `_site` folder is deployed to their highly-available, globally distributed hosting service. - ## AWS Amplify The [AWS Amplify Console](https://console.amplify.aws) provides continuous deployment and hosting for modern web apps (single page apps and static site generators). Continuous deployment allows developers to deploy updates to their web app on every code commit to their Git repository. Hosting includes features such as globally available CDNs, 1-click custom domain setup + HTTPS, feature branch deployments, redirects, trailing slashes, and password protection. From 79869e7225d62cab739fe55381fb0137f9ec7709 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 24 Mar 2022 09:03:55 -0700 Subject: [PATCH 043/290] Update history to reflect merge of #9007 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index dfe9891a7e2..35c406b75cf 100644 --- a/History.markdown +++ b/History.markdown @@ -60,6 +60,7 @@ * Fix typo in `_docs/deployment/manual.md` (#8997) * Add quiet/verbose options (#8996) * Update README.markdown re IRC Pointer (#9005) + * Remove Aerobatic (#9007) ### Bug Fixes From 9d86974e1f8273ac438a70f27b4bb10b4ac4a469 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 24 Mar 2022 21:35:58 +0530 Subject: [PATCH 044/290] Expose collection static files via `site.static_files` (#8961) Merge pull request 8961 --- lib/jekyll/collection.rb | 1 + lib/jekyll/site.rb | 9 ++++++++- test/test_site.rb | 9 +++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb index 0e9845c96fb..1ce33bf23c0 100644 --- a/lib/jekyll/collection.rb +++ b/lib/jekyll/collection.rb @@ -65,6 +65,7 @@ def read read_static_file(file_path, full_path) end end + site.static_files.concat(files) unless files.empty? sort_docs! end diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index 45c603dcf76..d2ca53a72d2 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -343,6 +343,13 @@ def docs_to_write documents.select(&:write?) end + # Get the to be written static files + # + # Returns an Array of StaticFiles which should be written + def static_files_to_write + static_files.select(&:write?) + end + # Get all the documents # # Returns an Array of all Documents @@ -353,7 +360,7 @@ def documents end def each_site_file - %w(pages static_files docs_to_write).each do |type| + %w(pages static_files_to_write docs_to_write).each do |type| send(type).each do |item| yield item end diff --git a/test/test_site.rb b/test/test_site.rb index c3f241d1023..8e02f9cb56e 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -735,4 +735,13 @@ def convert(*_args) end end end + + context "static files in a collection" do + should "be exposed via site instance" do + site = fixture_site("collections" => ["methods"]) + site.read + + assert_includes site.static_files.map(&:relative_path), "_methods/extensionless_static_file" + end + end end From 75df28c27a279005ea184521ff557ca2a95903e9 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 24 Mar 2022 09:06:00 -0700 Subject: [PATCH 045/290] Update history to reflect merge of #8961 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 35c406b75cf..f46f230d2a5 100644 --- a/History.markdown +++ b/History.markdown @@ -107,6 +107,7 @@ * Propagate _data folder from theme (#8815) * Support both tzinfo v1 and v2 alongwith non-half hour offsets. (#8880) * Run vendor-mimes to update mime.types (#8940) + * Expose collection static files via `site.static_files` (#8961) ### Site Enhancements From c4387f69fc08bce6f0110601d8ee0c6fbfaefdfa Mon Sep 17 00:00:00 2001 From: Parker Moore <237985+parkr@users.noreply.github.com> Date: Sun, 27 Mar 2022 13:28:29 -0700 Subject: [PATCH 046/290] Add Jekyll 3.9.2 release post to 'master' branch (#9013) Merge pull request 9013 --- History.markdown | 13 +++++++++++++ docs/_docs/history.md | 17 +++++++++++++++++ .../2022-03-27-jekyll-3-9-2-released.markdown | 19 +++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 docs/_posts/2022-03-27-jekyll-3-9-2-released.markdown diff --git a/History.markdown b/History.markdown index f46f230d2a5..6d07c104ba8 100644 --- a/History.markdown +++ b/History.markdown @@ -429,6 +429,19 @@ * Fix Kramdown converter based tests for v4.0.x (#8143) +## 3.9.2 / 2022-03-27 + +### Bug Fixes + + * Lock `http_parser.rb` gem to `v0.6.x` on JRuby (#8943) + * Backport #8756 for v3.9.x: Respect collections_dir config within include tag (#8795) + * Backport #8965 for v3.9.x: Fix response header for content served via `jekyll serve` (#8976) + +### Development Fixes + + * Update and fix CI for `3.9-stable` on Ruby 3.x (#8942) + * Fix CI for commits to `3.9-stable` branch (#8788) + ## 3.9.1 / 2021-04-08 ### Bug Fixes diff --git a/docs/_docs/history.md b/docs/_docs/history.md index fbcc1aa3411..f19be3b6a63 100644 --- a/docs/_docs/history.md +++ b/docs/_docs/history.md @@ -348,6 +348,23 @@ note: This file is autogenerated. Edit /History.markdown instead. - Fix Kramdown converter based tests for v4.0.x ([#8143]({{ site.repository }}/issues/8143)) +## 3.9.2 / 2022-03-27 +{: #v3-9-2} + +### Bug Fixes +{: #bug-fixes-v3-9-2} + +- Lock `http_parser.rb` gem to `v0.6.x` on JRuby ([#8943]({{ site.repository }}/issues/8943)) +- Backport [#8756]({{ site.repository }}/issues/8756) for v3.9.x: Respect collections_dir config within include tag ([#8795]({{ site.repository }}/issues/8795)) +- Backport [#8965]({{ site.repository }}/issues/8965) for v3.9.x: Fix response header for content served via `jekyll serve` ([#8976]({{ site.repository }}/issues/8976)) + +### Development Fixes +{: #development-fixes-v3-9-2} + +- Update and fix CI for `3.9-stable` on Ruby 3.x ([#8942]({{ site.repository }}/issues/8942)) +- Fix CI for commits to `3.9-stable` branch ([#8788]({{ site.repository }}/issues/8788)) + + ## 3.9.1 / 2021-04-08 {: #v3-9-1} diff --git a/docs/_posts/2022-03-27-jekyll-3-9-2-released.markdown b/docs/_posts/2022-03-27-jekyll-3-9-2-released.markdown new file mode 100644 index 00000000000..5ea445dbb5f --- /dev/null +++ b/docs/_posts/2022-03-27-jekyll-3-9-2-released.markdown @@ -0,0 +1,19 @@ +--- +title: 'Jekyll 3.9.2 Released' +date: 2022-03-27 13:20:00 -0700 +author: parkr +version: 3.9.2 +categories: [release] +--- + +Hey Jekyllers, + +Quick bug-fix release for you all today: + +1. Ruby 3.0 and 3.1 support :tada: (you will need to run `bundle add webrick` for `jekyll serve` to work) +2. `jekyll serve` will no longer inject a charset into the MIME type for +binary types +3. Incremental regeneration now handles includes in collection files + correctly + +That's all, Happy Jekylling! From e695c1e24b298994ecb84daa74fba3d20959cba9 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 27 Mar 2022 13:28:30 -0700 Subject: [PATCH 047/290] Update history to reflect merge of #9013 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 6d07c104ba8..05a25a017b9 100644 --- a/History.markdown +++ b/History.markdown @@ -61,6 +61,7 @@ * Add quiet/verbose options (#8996) * Update README.markdown re IRC Pointer (#9005) * Remove Aerobatic (#9007) + * Add Jekyll 3.9.2 release post to 'master' branch (#9013) ### Bug Fixes From 65158c2368df431cc37dcd6fa4305982af3f46c5 Mon Sep 17 00:00:00 2001 From: Moncef Belyamani Date: Mon, 28 Mar 2022 23:46:20 -0400 Subject: [PATCH 048/290] Simplify macOS installation docs (#8993) Merge pull request 8993 --- .github/actions/spelling/expect.txt | 2 + docs/_data/ruby.yml | 4 +- docs/_docs/installation/macos.md | 157 ++++++++-------------------- 3 files changed, 50 insertions(+), 113 deletions(-) diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index 461282704b4..83c5d112710 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -392,6 +392,7 @@ mkdown mmistakes modernizr mojombo +moncefbelyamani moz mreid msdn @@ -478,6 +479,7 @@ Posterous postfiles postlayout postmodern +preinstalled prepends Prioritise Probot diff --git a/docs/_data/ruby.yml b/docs/_data/ruby.yml index 10b6bfeadfb..527b7b14410 100644 --- a/docs/_data/ruby.yml +++ b/docs/_data/ruby.yml @@ -1,3 +1,3 @@ min_version: 2.5.0 -current_version: 3.0.0 -current_version_output: ruby 3.0.0p0 (2020-12-25 revision 95aff21468) +current_version: 3.1.1 +current_version_output: ruby 3.1.1p18 (2022-02-18 revision 53f5fc4236) diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md index 8394516c5dc..819ed8fb947 100644 --- a/docs/_docs/installation/macos.md +++ b/docs/_docs/installation/macos.md @@ -3,155 +3,90 @@ title: Jekyll on macOS permalink: /docs/installation/macos/ --- -## Install Command Line Tools -To install the command line tools to compile native extensions, open a terminal and run: +## Supported macOS versions -```sh -xcode-select --install -``` - -### set SDKROOT (only macOS Catalina or later) -Starting on macOS Catalina (10.15) the headers used for Ruby have been moved from their previous location which results in some gems, including Jekyll to fail installation. This can be solved by setting SDKROOT in your shell configuration to the value provided by xcrun. +- Monterey (macOS 12) +- Big Sur (macOS 11) +- Catalina (macOS 10.15) -```ssh -export SDKROOT=$(xcrun --show-sdk-path) -``` +Older macOS versions might work, but we don't officially support them. ## Install Ruby -Jekyll requires **Ruby v{{ site.data.ruby.min_version }}** or higher. -macOS Big Sur 11.x ships with Ruby 2.6.3. Check your Ruby version using `ruby -v`. +To install Jekyll on macOS, you need a proper Ruby development environment. +While macOS comes preinstalled with Ruby, we don't recommend using that version +to install Jekyll. This external article goes over the various reasons +[why you shouldn't use the system Ruby](https://www.moncefbelyamani.com/why-you-shouldn-t-use-the-system-ruby-to-install-gems-on-a-mac/). -If you're running a previous version of macOS, you'll have to install a newer version of Ruby. Installation with [Homebrew](https://brew.sh) is simple if you're only planning to use Ruby for Jekyll. Install with a version manager such as [asdf](https://asdf-vm.com/), [chruby](https://github.com/postmodern/chruby), [rbenv](https://github.com/rbenv/rbenv), or [rvm](https://rvm.io/) if you need to switch among Ruby versions (instructions for rbenv are below). See the guide [Install Ruby on Mac](https://mac.install.guide/ruby/index.html) for details and recommendations. +Instead, you'll need to install a separate and newer version of Ruby using a +version manager such as [asdf], [chruby], [rbenv], or [rvm]. Version managers +allow you to easily install multiple versions of Ruby, and switch between them. -### With Homebrew {#brew} -To run the latest Ruby version you need to install it through [Homebrew](https://brew.sh). +We recommend `chruby` because it's the simplest and least likely to cause issues. -```sh -# Install Homebrew -/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" +The instructions below are an excerpt from this detailed external guide to +[install Ruby on Mac]. They work best if you're setting up development tools +for the first time on your Mac. If you've already tried to install Ruby or +Jekyll on your Mac, or if you run into any issues, read that guide. -# Install Ruby -brew install ruby -``` - -Add the brew ruby and gems path to your shell configuration: - -```bash -# If you're using Zsh -echo 'export PATH="/usr/local/opt/ruby/bin:/usr/local/lib/ruby/gems/3.0.0/bin:$PATH"' >> ~/.zshrc +[asdf]: https://asdf-vm.com/ +[chruby]: https://github.com/postmodern/chruby +[rbenv]: https://github.com/rbenv/rbenv +[rvm]: https://rvm.io/ +[install Ruby on Mac]: https://www.moncefbelyamani.com/how-to-install-xcode-homebrew-git-rvm-ruby-on-mac/ -# If you're using Bash -echo 'export PATH="/usr/local/opt/ruby/bin:/usr/local/lib/ruby/gems/3.0.0/bin:$PATH"' >> ~/.bash_profile - -# Unsure which shell you are using? Type -echo $SHELL -``` +### Step 1: Install Homebrew -Relaunch your terminal and check your Ruby setup: +[Homebrew](https://brew.sh/) makes it easy to install development tools on a Mac. ```sh -which ruby -# /usr/local/opt/ruby/bin/ruby - -ruby -v -{{ site.data.ruby.current_version_output }} -``` - -You're now running the current stable version of Ruby! - -### With rbenv {#rbenv} - -People often use [rbenv](https://github.com/rbenv/rbenv) to manage multiple -Ruby versions. This is very useful when you need to be able to run a given Ruby version on a project. - -```sh -# Install Homebrew /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - -# Install rbenv and ruby-build -brew install rbenv - -# Set up rbenv integration with your shell -rbenv init - -# Check your installation -curl -fsSL https://github.com/rbenv/rbenv-installer/raw/main/bin/rbenv-doctor | bash ``` -Restart your terminal to apply your changes. -Next, you can install the Ruby version you want. Let's install the latest stable version: +### Step 2: Install chruby and the latest Ruby with ruby-install + +Install `chruby` and `ruby-install` with Homebrew: ```sh -rbenv install {{ site.data.ruby.current_version }} -rbenv global {{ site.data.ruby.current_version }} -ruby -v -{{ site.data.ruby.current_version_output }} +brew install chruby ruby-install ``` -That's it! Head over to [rbenv command references](https://github.com/rbenv/rbenv#command-reference) to learn how to use different versions of Ruby in your projects. - -## Install Jekyll - -After installing Ruby, install Jekyll and Bundler. - -### Local Install - -Install the bundler and jekyll gems: +Install the latest stable version of Ruby: ```sh -gem install --user-install bundler jekyll +ruby-install ruby ``` -Get your Ruby version: +This will take a few minutes, and once it's done, configure your shell to +automatically use `chruby`: ```sh -ruby -v -{{ site.data.ruby.current_version_output }} +echo "source $(brew --prefix)/opt/chruby/share/chruby/chruby.sh" >> ~/.zshrc +echo "source $(brew --prefix)/opt/chruby/share/chruby/auto.sh" >> ~/.zshrc +echo "chruby ruby-{{ site.data.ruby.current_version }}" >> ~/.zshrc ``` -Append your path file with the following, replacing the `X.X` with the first two digits of your Ruby version: +If you're using Bash, replace `.zshrc` with `.bash_profile`. If you're not sure, +read this external guide to +[find out which shell you're using](https://www.moncefbelyamani.com/which-shell-am-i-using-how-can-i-switch/). -```bash -# If you're using Zsh -echo 'export PATH="$HOME/.gem/ruby/X.X.0/bin:$PATH"' >> ~/.zshrc - -# If you're using Bash -echo 'export PATH="$HOME/.gem/ruby/X.X.0/bin:$PATH"' >> ~/.bash_profile - -# Unsure which shell you are using? Type -echo $SHELL -``` - -Check that `GEM PATHS:` points to your home directory: +Quit and relaunch Terminal, then check that everything is working: ```sh -gem env +ruby -v ``` -{: .note .info} -Every time you update Ruby to a version in which the first two digits change, update your path to match. - -### Global Install - -{: .note .warning} -We recommend not installing Ruby gems globally to avoid file permissions problems and using `sudo`. +It should show {{ site.data.ruby.current_version_output }} or a newer version. -#### On Mojave (10.14) +Next, read that same external guide for important notes about +[setting and switching between Ruby versions with chruby](https://www.moncefbelyamani.com/how-to-install-xcode-homebrew-git-rvm-ruby-on-mac/#how-to-install-different-versions-of-ruby-and-switch-between-them). -Because of SIP Protections in Mojave, run: - -```sh -sudo gem install bundler -sudo gem install -n /usr/local/bin/ jekyll -``` - -#### Before Mojave (<10.14) +## Install Jekyll -Run: +After installing Ruby with chruby, install the latest Jekyll gem: ```sh -sudo gem install bundler jekyll +gem install jekyll ``` ## Troubleshooting From 310459370ad8bb9c0b574735dcca4868a5f05803 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 28 Mar 2022 20:46:22 -0700 Subject: [PATCH 049/290] Update history to reflect merge of #8993 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 05a25a017b9..e77d8daad1a 100644 --- a/History.markdown +++ b/History.markdown @@ -62,6 +62,7 @@ * Update README.markdown re IRC Pointer (#9005) * Remove Aerobatic (#9007) * Add Jekyll 3.9.2 release post to 'master' branch (#9013) + * Simplify macOS installation docs (#8993) ### Bug Fixes From 776748e13f5a5f1e65d9a8e865e9126bf134f25b Mon Sep 17 00:00:00 2001 From: JJ Date: Fri, 1 Apr 2022 10:24:55 -0300 Subject: [PATCH 050/290] Expose `basename` from `document.rb` as `name` to Liquid templates (#8761) Merge pull request 8761 --- features/post_data.feature | 12 ++++++++++++ lib/jekyll/drops/document_drop.rb | 1 + lib/jekyll/drops/excerpt_drop.rb | 4 ++++ test/test_filters.rb | 1 + 4 files changed, 18 insertions(+) diff --git a/features/post_data.feature b/features/post_data.feature index cdfe07b7956..e807f9bc19d 100644 --- a/features/post_data.feature +++ b/features/post_data.feature @@ -27,6 +27,18 @@ Feature: Post data And the _site directory should exist And I should see "Post url: /2009/03/27/star-wars.html" in "_site/2009/03/27/star-wars.html" + Scenario: Use page.name variable + Given I have a _posts directory + And I have a _layouts directory + And I have the following post: + | title | date | layout | content | + | Star Wars | 2009-03-27 | simple | Luke, I am your father. | + And I have a simple layout that contains "Page name: {{ page.name }}" + When I run jekyll build + Then I should get a zero exit status + And the _site directory should exist + And I should see "Page name: 2009-03-27-star-wars.markdown" in "_site/2009/03/27/star-wars.html" + Scenario: Use post.date variable Given I have a _posts directory And I have a _layouts directory diff --git a/lib/jekyll/drops/document_drop.rb b/lib/jekyll/drops/document_drop.rb index fef5920be61..00e51e20594 100644 --- a/lib/jekyll/drops/document_drop.rb +++ b/lib/jekyll/drops/document_drop.rb @@ -12,6 +12,7 @@ class DocumentDrop < Drop mutable false delegate_method_as :relative_path, :path + delegate_method_as :basename, :name private delegate_method_as :data, :fallback_data delegate_methods :id, :output, :content, :to_s, :relative_path, :url, :date diff --git a/lib/jekyll/drops/excerpt_drop.rb b/lib/jekyll/drops/excerpt_drop.rb index 425133fa71e..64a8aa7daaa 100644 --- a/lib/jekyll/drops/excerpt_drop.rb +++ b/lib/jekyll/drops/excerpt_drop.rb @@ -14,6 +14,10 @@ def date def excerpt nil end + + def name + @obj.doc.basename + end end end end diff --git a/test/test_filters.rb b/test/test_filters.rb index 1ebc360b029..176e5ed6d49 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -665,6 +665,7 @@ def select; end should "convert drop to json" do @filter.site.read expected = { + "name" => "2008-02-02-published.markdown", "path" => "_posts/2008-02-02-published.markdown", "previous" => nil, "output" => nil, From 3c46d844cf78bd5688dea86efee7dda86119ac1d Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 1 Apr 2022 06:24:57 -0700 Subject: [PATCH 051/290] Update history to reflect merge of #8761 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index e77d8daad1a..a658670a937 100644 --- a/History.markdown +++ b/History.markdown @@ -110,6 +110,7 @@ * Support both tzinfo v1 and v2 alongwith non-half hour offsets. (#8880) * Run vendor-mimes to update mime.types (#8940) * Expose collection static files via `site.static_files` (#8961) + * Expose `basename` from `document.rb` as `name` to Liquid templates (#8761) ### Site Enhancements From 2a0272cc384e09ab58b8f1a3b68b1a6a2da107f0 Mon Sep 17 00:00:00 2001 From: lm Date: Fri, 1 Apr 2022 08:35:24 -0500 Subject: [PATCH 052/290] Only enable BOM encoding option on UTF encodings (#8363) Merge pull request 8363 --- lib/jekyll/utils.rb | 7 +++++-- test/test_utils.rb | 9 ++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index 49d67f4b24f..2a965270481 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -304,12 +304,15 @@ def safe_glob(dir, patterns, flags = 0) # and a given param def merged_file_read_opts(site, opts) merged = (site ? site.file_read_opts : {}).merge(opts) - if merged[:encoding] && !merged[:encoding].start_with?("bom|") + + # always use BOM when reading UTF-encoded files + if merged[:encoding]&.downcase&.start_with?("utf-") merged[:encoding] = "bom|#{merged[:encoding]}" end - if merged["encoding"] && !merged["encoding"].start_with?("bom|") + if merged["encoding"]&.downcase&.start_with?("utf-") merged["encoding"] = "bom|#{merged["encoding"]}" end + merged end diff --git a/test/test_utils.rb b/test/test_utils.rb index 969ffaa13f2..7f230c3785a 100644 --- a/test/test_utils.rb +++ b/test/test_utils.rb @@ -408,13 +408,20 @@ class TestUtils < JekyllUnitTest assert_nil opts[:encoding] end - should "add bom to encoding" do + should "add bom to utf-encoding" do opts = { "encoding" => "utf-8", :encoding => "utf-8" } merged = Utils.merged_file_read_opts(nil, opts) assert_equal "bom|utf-8", merged["encoding"] assert_equal "bom|utf-8", merged[:encoding] end + should "not add bom to non-utf encoding" do + opts = { "encoding" => "ISO-8859-1", :encoding => "ISO-8859-1" } + merged = Utils.merged_file_read_opts(nil, opts) + assert_equal "ISO-8859-1", merged["encoding"] + assert_equal "ISO-8859-1", merged[:encoding] + end + should "preserve bom in encoding" do opts = { "encoding" => "bom|another", :encoding => "bom|another" } merged = Utils.merged_file_read_opts(nil, opts) From d4e10d5954bc1a16f2e178c54ae1dc4cb016d78e Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 1 Apr 2022 06:35:26 -0700 Subject: [PATCH 053/290] Update history to reflect merge of #8363 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index a658670a937..4eaad89ba27 100644 --- a/History.markdown +++ b/History.markdown @@ -78,6 +78,7 @@ * Fix deprecation message for missing doc method (#8960) * Fix response header for content served via `jekyll serve` (#8965) * Trigger livereload in sites without pages (#8337) + * Only enable BOM encoding option on UTF encodings (#8363) ### Development Fixes From 66e337984e05c514402369936f42e18ea7b25cd7 Mon Sep 17 00:00:00 2001 From: MichaelCordingley <55990206+MichaelCordingley@users.noreply.github.com> Date: Fri, 1 Apr 2022 09:42:01 -0400 Subject: [PATCH 054/290] Allow Configurable Converters on CSV (#8858) Merge pull request 8858 --- .github/actions/spelling/patterns.txt | 3 ++ docs/_docs/datafiles.md | 27 +++++++++++++++ lib/jekyll/readers/data_reader.rb | 47 +++++++++++++++++++++++---- test/fixtures/sample.csv | 3 ++ test/fixtures/sample.tsv | 3 ++ test/test_data_reader.rb | 43 ++++++++++++++++++++++++ 6 files changed, 119 insertions(+), 7 deletions(-) create mode 100644 test/fixtures/sample.csv create mode 100644 test/fixtures/sample.tsv diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt index ae5c5e2a2e5..341825df898 100644 --- a/.github/actions/spelling/patterns.txt +++ b/.github/actions/spelling/patterns.txt @@ -48,6 +48,9 @@ themes\.googleusercontent\.com/static/fonts/[^/]+/v\d+/[^.]+. # google_site_verification: google_site_verification: [-a-zA-Z=;:/0-9+]* +# Ruby-doc.org +https://ruby-doc\.org/.* + # Contributors alphabetical order.*:.* twitter_handle: .* diff --git a/docs/_docs/datafiles.md b/docs/_docs/datafiles.md index 2140a4c30de..c78b376ac91 100644 --- a/docs/_docs/datafiles.md +++ b/docs/_docs/datafiles.md @@ -148,3 +148,30 @@ author: dave {% endraw %} For information on how to build robust navigation for your site (especially if you have a documentation website or another type of Jekyll site with a lot of pages to organize), see [Navigation]({{ '/tutorials/navigation/' | relative_url }}). + +## CSV/TSV Parse Options + +The way Ruby parses CSV and TSV files can be customized with the `csv_reader` and `tsv_reader` +configuration options. Each configuration key exposes the same options: + +`converters`: What [CSV converters](https://ruby-doc.org/stdlib-2.5.0/libdoc/csv/rdoc/CSV.html#Converters) should be + used when parsing the file. Available options are `integer`, `float`, `numeric`, `date`, `date_time` and + `all`. By default, this list is empty. +`encoding`: What encoding the files are in. Defaults to the site `encoding` configuration option. +`headers`: Boolean field for whether to parse the first line of the file as headers. When `false`, it treats the + first row as data. Defaults to `true`. + +Examples: + +```yaml +csv_reader: + converters: + - numeric + - datetime + headers: true + encoding: utf-8 +tsv_reader: + converters: + - all + headers: false +``` diff --git a/lib/jekyll/readers/data_reader.rb b/lib/jekyll/readers/data_reader.rb index d34076d08d9..80b57bd6bd7 100644 --- a/lib/jekyll/readers/data_reader.rb +++ b/lib/jekyll/readers/data_reader.rb @@ -59,14 +59,9 @@ def read_data_file(path) case File.extname(path).downcase when ".csv" - CSV.read(path, - :headers => true, - :encoding => site.config["encoding"]).map(&:to_hash) + CSV.read(path, **csv_config).map { |row| convert_row(row) } when ".tsv" - CSV.read(path, - :col_sep => "\t", - :headers => true, - :encoding => site.config["encoding"]).map(&:to_hash) + CSV.read(path, **tsv_config).map { |row| convert_row(row) } else SafeYAML.load_file(path) end @@ -76,5 +71,43 @@ def sanitize_filename(name) name.gsub(%r![^\w\s-]+|(?<=^|\b\s)\s+(?=$|\s?\b)!, "") .gsub(%r!\s+!, "_") end + + private + + # @return [Hash] + def csv_config + @csv_config ||= read_config("csv_reader") + end + + # @return [Hash] + def tsv_config + @tsv_config ||= read_config("tsv_reader", { :col_sep => "\t" }) + end + + # @param config_key [String] + # @param overrides [Hash] + # @return [Hash] + # @see https://ruby-doc.org/stdlib-2.5.0/libdoc/csv/rdoc/CSV.html#Converters + def read_config(config_key, overrides = {}) + reader_config = config[config_key] || {} + + defaults = { + :converters => reader_config.fetch("csv_converters", []).map(&:to_sym), + :headers => reader_config.fetch("headers", true), + :encoding => reader_config.fetch("encoding", config["encoding"]), + } + + defaults.merge(overrides) + end + + def config + @config ||= site.config + end + + # @param row [Array, CSV::Row] + # @return [Array, Hash] + def convert_row(row) + row.instance_of?(CSV::Row) ? row.to_hash : row + end end end diff --git a/test/fixtures/sample.csv b/test/fixtures/sample.csv new file mode 100644 index 00000000000..b4b36e6d3b7 --- /dev/null +++ b/test/fixtures/sample.csv @@ -0,0 +1,3 @@ +id,field_a +1,"foo" +2,"bar" diff --git a/test/fixtures/sample.tsv b/test/fixtures/sample.tsv new file mode 100644 index 00000000000..c467a88a470 --- /dev/null +++ b/test/fixtures/sample.tsv @@ -0,0 +1,3 @@ +id field_a +1 "foo" +2 "bar" diff --git a/test/test_data_reader.rb b/test/test_data_reader.rb index 038ec679e3d..0c0fd2478f3 100644 --- a/test/test_data_reader.rb +++ b/test/test_data_reader.rb @@ -14,4 +14,47 @@ class TestDataReader < JekyllUnitTest ) end end + + context "with no csv options set" do + setup do + @reader = DataReader.new(fixture_site) + @parsed = [{ "id" => "1", "field_a" => "foo" }, { "id" => "2", "field_a" => "bar" }] + end + + should "parse CSV normally" do + assert_equal @parsed, @reader.read_data_file(File.expand_path("fixtures/sample.csv", __dir__)) + end + + should "parse TSV normally" do + assert_equal @parsed, @reader.read_data_file(File.expand_path("fixtures/sample.tsv", __dir__)) + end + end + + context "with csv options set" do + setup do + reader_config = { + "csv_converters" => [:numeric], + "headers" => false, + } + + @reader = DataReader.new( + fixture_site( + { + "csv_reader" => reader_config, + "tsv_reader" => reader_config, + } + ) + ) + + @parsed = [%w(id field_a), [1, "foo"], [2, "bar"]] + end + + should "parse CSV with options" do + assert_equal @parsed, @reader.read_data_file(File.expand_path("fixtures/sample.csv", __dir__)) + end + + should "parse TSV with options" do + assert_equal @parsed, @reader.read_data_file(File.expand_path("fixtures/sample.tsv", __dir__)) + end + end end From e7ce73d593d26d215f3722eb9c9bd964a6fbffab Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 1 Apr 2022 06:42:03 -0700 Subject: [PATCH 055/290] Update history to reflect merge of #8858 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 4eaad89ba27..b2fcc993fef 100644 --- a/History.markdown +++ b/History.markdown @@ -112,6 +112,7 @@ * Run vendor-mimes to update mime.types (#8940) * Expose collection static files via `site.static_files` (#8961) * Expose `basename` from `document.rb` as `name` to Liquid templates (#8761) + * Allow Configurable Converters on CSV (#8858) ### Site Enhancements From 6f31b362ebb140e0a9236dee49f2427f933d8722 Mon Sep 17 00:00:00 2001 From: JT Date: Sat, 2 Apr 2022 23:25:16 +0800 Subject: [PATCH 056/290] Improve document about Github Actions section (#8853) Merge pull request 8853 --- .../continuous-integration/github-actions.md | 38 ++++++++++++++++--- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/docs/_docs/continuous-integration/github-actions.md b/docs/_docs/continuous-integration/github-actions.md index acf8afb169b..392bde82d05 100644 --- a/docs/_docs/continuous-integration/github-actions.md +++ b/docs/_docs/continuous-integration/github-actions.md @@ -92,8 +92,8 @@ was generated with an old version of Bundler. ### Setting up the Action GitHub Actions are registered for a repository by using a YAML file inside the directory path -`.github/workflows` (note the dot at the start). Here we shall employ -[Jekyll Actions][jekyll-actions] from the Marketplace for its simplicity. +`.github/workflows` (note the dot at the start). For simplicity, here we use one of the +[Jekyll Actions](#external-links) to show you how to use the action. Create a **workflow file**, say `github-pages.yml`, using either the GitHub interface or by pushing a YAML file to the workflow directory path manually. The base contents are: @@ -119,8 +119,8 @@ jobs: key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile') }} restore-keys: | ${{ runner.os }}-gems- - - uses: helaili/jekyll-action@v2 - with: + - uses: helaili/jekyll-action@2.0.5 # Choose any one of the Jekyll Actions + with: # Some relative inputs of your action token: ${{ secrets.GITHUB_TOKEN }} ``` @@ -133,8 +133,9 @@ The above workflow can be explained as the following: - The **name** of the job matches our YAML filename: `github-pages`. - The **checkout** action takes care of cloning your repository. - The **cache** action is an optimization to avoid fetching and installing gems on every build. -- We specify our selected **action** and **version number** using `helaili/jekyll-action@2.0.5`. - This handles the build and deploy. +- We specify our selected **action** and **version number** using `helaili/jekyll-action@2.0.5`, + this handles the build and deploy. You can choose any one of the Jekyll Actions that matches + your project and flavor from [GitHub Marketplace](https://github.com/marketplace?type=actions&query=jekyll+action). - We set a reference to a secret **environment variable** for the action to use. The `GITHUB_TOKEN` is a secret token automatically initialized at the start of every workflow run. More information can be found in [GitHub documentation](https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret). @@ -154,6 +155,29 @@ Note that this string must be quoted to prevent the asterisks from being evaluat [on.schedule]: https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#onschedule [crontab guru]: https://crontab.guru/ +### Providing permissions + +At the start of each workflow run, GitHub automatically creates a unique `GITHUB_TOKEN` secret to use in +your workflow. You can use the `GITHUB_TOKEN` to authenticate in a workflow run. You can use the +`GITHUB_TOKEN` by using the standard syntax for referencing secrets: `${{ secrets.GITHUB_TOKEN }}`. +For more information, please read [GitHub's docs on token authentication][github-token-ref] + +[github-token-ref]: https://docs.github.com/en/actions/security-guides/automatic-token-authentication + +If you need a token that requires permissions that aren't available in the `GITHUB_TOKEN`, you can create +a Personal Access Token (PAT), and set it as a secret in your repository for this action to push to the +`gh-pages` branch: + +1. On your GitHub profile, under **Developer Settings**, go to the [Personal Access Tokens][tokens] + section. +2. **Create** a token. Give it a name like "GitHub Actions" and ensure it has permissions to + `public_repos` (or the entire `repo` scope for private repository) --- necessary for the action + to commit to the `gh-pages` branch. +3. **Copy** the token value. +4. Go to your repository's **Settings** and then the **Secrets** tab. +5. **Create** a token named `YOUR_CUSTOM_TOKEN` (_important_). Give it a value using the value copied + above. + ### Build and deploy On pushing any local changes onto `main`, the action will be triggered and the build will @@ -197,6 +221,7 @@ successful deploy from the Action. - [jekyll-actions-quickstart] is an unofficial repository that includes a live demo of the `jekyll-actions` action. That project can be used as a template for making a new site. - [jekyll-action-ts] is another action to build and publish Jekyll sites on GiHub Pages that includes HTML formatting options with Prettier and caching. +- [jekyll-deploy-action] is a GitHub Action to deploy the Jekyll site conveniently for GitHub Pages (An alternative action with better speed and compatibility). [ghp-whitelist]: https://pages.github.com/versions/ [timeago-plugin]: https://rubygems.org/gems/jekyll-timeago @@ -204,3 +229,4 @@ successful deploy from the Action. [jekyll-actions]: https://github.com/marketplace/actions/jekyll-actions [jekyll-actions-quickstart]: https://github.com/MichaelCurrin/jekyll-actions-quickstart [jekyll-action-ts]: https://github.com/limjh16/jekyll-action-ts +[jekyll-deploy-action]: https://github.com/jeffreytse/jekyll-deploy-action From e7cc390d2b0c35a35d9fb4c4b5e6dbf0e7d15bd2 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sat, 2 Apr 2022 08:25:17 -0700 Subject: [PATCH 057/290] Update history to reflect merge of #8853 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index b2fcc993fef..bf289e45a83 100644 --- a/History.markdown +++ b/History.markdown @@ -63,6 +63,7 @@ * Remove Aerobatic (#9007) * Add Jekyll 3.9.2 release post to 'master' branch (#9013) * Simplify macOS installation docs (#8993) + * Improve document about Github Actions section (#8853) ### Bug Fixes From 1d5bae583b6b658cc9f6938fbce474f2a56229f2 Mon Sep 17 00:00:00 2001 From: Daryl Hepting Date: Sat, 2 Apr 2022 09:25:55 -0600 Subject: [PATCH 058/290] Update permalinks.md (#9017) Merge pull request 9017 --- docs/_docs/permalinks.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/_docs/permalinks.md b/docs/_docs/permalinks.md index 99a90cea4f4..e381e7de0f9 100644 --- a/docs/_docs/permalinks.md +++ b/docs/_docs/permalinks.md @@ -229,7 +229,7 @@ Here's the full list of placeholders available:

Title from the document’s filename. May be overridden via - the document’s slug front matter. + the document’s slug front matter. Preserves case from the source.

@@ -409,6 +409,7 @@ Collections have the following placeholders available: variable value if any is present in the document; if none is defined then :title will be equivalent to :name, aka the slug generated from the filename. + Preserves case from the source.

From 19868d5602120fe4257be1a01791be0b0686f1a5 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sat, 2 Apr 2022 08:25:56 -0700 Subject: [PATCH 059/290] Update history to reflect merge of #9017 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index bf289e45a83..8543d4d3a4f 100644 --- a/History.markdown +++ b/History.markdown @@ -64,6 +64,7 @@ * Add Jekyll 3.9.2 release post to 'master' branch (#9013) * Simplify macOS installation docs (#8993) * Improve document about Github Actions section (#8853) + * Update permalinks.md (#9017) ### Bug Fixes From 9c7972dc386d32c498f3f003f1c47e853c3a6a36 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sun, 3 Apr 2022 22:28:57 +0530 Subject: [PATCH 060/290] Check symlink outside site_source without Pathutil (#9015) Merge pull request 9015 --- lib/jekyll/entry_filter.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb index 936dd7c3445..4e70a5d9c7b 100644 --- a/lib/jekyll/entry_filter.rb +++ b/lib/jekyll/entry_filter.rb @@ -86,14 +86,10 @@ def symlink?(entry) end # -- - # NOTE: Pathutil#in_path? gets the realpath. - # @param [] entry the entry you want to validate. - # Check if a path is outside of our given root. + # Check if given path is outside of current site's configured source directory. # -- def symlink_outside_site_source?(entry) - !Pathutil.new(entry).in_path?( - site.in_source_dir - ) + !File.realpath(entry).start_with?(site.in_source_dir) end # Check if an entry matches a specific pattern. From 354110d393b64245170b975f44b244c0f3a52292 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 3 Apr 2022 09:58:58 -0700 Subject: [PATCH 061/290] Update history to reflect merge of #9015 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 8543d4d3a4f..0d5d4b94d07 100644 --- a/History.markdown +++ b/History.markdown @@ -100,6 +100,7 @@ * Fix random test failures in TestExcerpt #to_liquid (#8884) * Lock gem `psych` to `v3.x` (#8918) * Fix typo in Bug Report template (#8951) + * Check symlink outside site_source without Pathutil (#9015) ### Minor Enhancements From e052d2090cc2509053330b3f0fc5cdd0850447d0 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 7 Apr 2022 14:26:42 +0530 Subject: [PATCH 062/290] Stop testing with Rubies older than 2.7 on non-Windows (#8955) Merge pull request 8955 --- .github/workflows/ci.yml | 10 ++++------ .rubocop.yml | 2 +- .rubocop_todo.yml | 17 +++++++---------- appveyor.yml | 4 ---- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c7ac94f36b..50e994e3476 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,16 +18,14 @@ jobs: fail-fast: false matrix: include: - - label: Ruby 2.5 - ruby_version: "2.5" - label: Ruby 2.7 ruby_version: "2.7" - label: Ruby 3.0 ruby_version: "3.0" - label: Ruby 3.1 ruby_version: "3.1" - - label: JRuby 9.2.20.1 - ruby_version: "jruby-9.2.20.1" + - label: JRuby 9.3.4.0 + ruby_version: "jruby-9.3.4.0" steps: - name: Checkout Repository uses: actions/checkout@v2 @@ -53,11 +51,11 @@ jobs: - job_name: "Profile Docs Site" step_name: "Build and Profile docs site" script_file: "profile-docs" - ruby_version: "2.5" + ruby_version: "2.7" - job_name: "Style Check" step_name: "Run RuboCop" script_file: "fmt" - ruby_version: "2.5" + ruby_version: "2.7" steps: - name: Checkout Repository uses: actions/checkout@v2 diff --git a/.rubocop.yml b/.rubocop.yml index 03324d133eb..ffdaffa31ff 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -13,7 +13,7 @@ Jekyll/NoPutsAllowed: - rake/*.rake AllCops: - TargetRubyVersion: 2.5 + TargetRubyVersion: 2.7 Include: - lib/**/*.rb - test/**/*.rb diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 04c51c67d9f..f7477b86681 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,11 +1,17 @@ # This configuration was generated by # `rubocop --auto-gen-config --auto-gen-only-exclude` -# on 2021-10-06 12:22:03 UTC using RuboCop version 1.22.1. +# on 2022-04-06 10:48:47 UTC using RuboCop version 1.26.1. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. +# Offense count: 1 +# This cop supports safe auto-correction (--auto-correct). +Performance/BindCall: + Exclude: + - 'test/helper.rb' + # Offense count: 1 Style/CombinableLoops: Exclude: @@ -17,12 +23,3 @@ Style/CombinableLoops: Style/OptionalBooleanParameter: Exclude: - 'lib/jekyll/log_adapter.rb' - -# Offense count: 2 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline. -# SupportedStyles: single_quotes, double_quotes -Style/StringLiterals: - Exclude: - - 'lib/jekyll/filters.rb' - - 'lib/jekyll/utils.rb' diff --git a/appveyor.yml b/appveyor.yml index db721048c44..af31dd5b885 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,8 +19,6 @@ environment: - RUBY_FOLDER_VER: "26" TZINFO_VERSION: "~> 2.0" TEST_SUITE: "test" - - RUBY_FOLDER_VER: "26" - TEST_SUITE: "test" - RUBY_FOLDER_VER: "26" TEST_SUITE: "default-site" - RUBY_FOLDER_VER: "26" @@ -33,8 +31,6 @@ environment: - RUBY_FOLDER_VER: "26" TZINFO_VERSION: "~> 2.0" TEST_SUITE: "cucumber" - - RUBY_FOLDER_VER: "26" - TEST_SUITE: "cucumber" install: - SET PATH=C:\Ruby%RUBY_FOLDER_VER%-x64\bin;%PATH% From d1ecbcbff43feb0dc9f6b2d0f1c6ccd977c82809 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 7 Apr 2022 01:56:44 -0700 Subject: [PATCH 063/290] Update history to reflect merge of #8955 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 0d5d4b94d07..d688d717e50 100644 --- a/History.markdown +++ b/History.markdown @@ -101,6 +101,7 @@ * Lock gem `psych` to `v3.x` (#8918) * Fix typo in Bug Report template (#8951) * Check symlink outside site_source without Pathutil (#9015) + * Stop testing with Rubies older than 2.7 on non-Windows (#8955) ### Minor Enhancements From 23a2451459729e6fe72f45a0b101221eadee18ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Apr 2022 03:53:38 -0700 Subject: [PATCH 064/290] Bump actions/checkout from 2 to 3 (#8986) Merge pull request 8986 --- .github/workflows/benchmark.yml | 2 +- .github/workflows/ci.yml | 4 ++-- .github/workflows/docs.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/spelling.yml | 2 +- .github/workflows/third-party.yml | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 61991d3cc59..0758e3948d3 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -20,7 +20,7 @@ jobs: BENCHMARK: true steps: - name: Checkout Jekyll - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50e994e3476..ad8547e39fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: ruby_version: "jruby-9.3.4.0" steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: "Set up ${{ matrix.label }}" uses: ruby/setup-ruby@v1 with: @@ -58,7 +58,7 @@ jobs: ruby_version: "2.7" steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: "Set up Ruby ${{ matrix.ruby_version }}" uses: ruby/setup-ruby@v1 with: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index dc082c9367a..a24fffd0c31 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -17,7 +17,7 @@ jobs: BUNDLE_JOBS: 4 BUNDLE_RETRY: 3 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ env.RUBY_VERSION }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d181e6d0a6d..3585815ac47 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - 2.7 steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: "Set up Ruby ${{ matrix.ruby_version }}" uses: ruby/setup-ruby@v1 with: diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index 589b05dbb38..c6f39b7c209 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -17,6 +17,6 @@ jobs: runs-on: "ubuntu-latest" steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Check Spellings uses: check-spelling/check-spelling@v0.0.19 diff --git a/.github/workflows/third-party.yml b/.github/workflows/third-party.yml index 1312af17b93..288f24dfd45 100644 --- a/.github/workflows/third-party.yml +++ b/.github/workflows/third-party.yml @@ -18,12 +18,12 @@ jobs: BUNDLE_RETRY: 3 steps: - name: Checkout Jekyll - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 5 path: jekyll - name: Checkout Third-Party Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: ashmaroli/tomjoht.github.io path: sandbox From 0d0fd3f41bb9cf0da1ecd301a23602599851a639 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 7 Apr 2022 03:53:40 -0700 Subject: [PATCH 065/290] Update history to reflect merge of #8986 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index d688d717e50..b596c41c20f 100644 --- a/History.markdown +++ b/History.markdown @@ -102,6 +102,7 @@ * Fix typo in Bug Report template (#8951) * Check symlink outside site_source without Pathutil (#9015) * Stop testing with Rubies older than 2.7 on non-Windows (#8955) + * Bump actions/checkout from 2 to 3 (#8986) ### Minor Enhancements From 3b3f845846df9b5ef51502a2d160febde538d968 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Fri, 8 Apr 2022 14:43:21 +0530 Subject: [PATCH 066/290] Ensure theme config is a `Jekyll::Configuration` object (#8988) Merge pull request 8988 --- lib/jekyll/site.rb | 4 ++++ test/test_site.rb | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index d2ca53a72d2..abd75883bad 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -476,7 +476,11 @@ def load_theme_configuration(config) theme_config.delete_if { |key, _| Configuration::DEFAULTS.key?(key) } # Override theme_config with existing config and return the result. + # Additionally ensure we return a `Jekyll::Configuration` instance instead of a Hash. Utils.deep_merge_hashes(theme_config, config) + .each_with_object(Jekyll::Configuration.new) do |(key, value), conf| + conf[key] = value + end end # Limits the current posts; removes the posts which exceed the limit_posts diff --git a/test/test_site.rb b/test/test_site.rb index 8e02f9cb56e..56419a737c9 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -97,6 +97,12 @@ def read_posts ) end + should "load config file from theme-gem as Jekyll::Configuration instance" do + site = fixture_site("theme" => "test-theme") + assert_instance_of Jekyll::Configuration, site.config + assert_equal "Hello World", site.config["title"] + end + context "with a custom cache_dir configuration" do should "have the custom cache_dir hidden from Git" do site = fixture_site("cache_dir" => "../../custom-cache-dir") From b02b070d8629aedecf9f93a67102703620838787 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 8 Apr 2022 02:13:22 -0700 Subject: [PATCH 067/290] Update history to reflect merge of #8988 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index b596c41c20f..f12d0494f00 100644 --- a/History.markdown +++ b/History.markdown @@ -81,6 +81,7 @@ * Fix response header for content served via `jekyll serve` (#8965) * Trigger livereload in sites without pages (#8337) * Only enable BOM encoding option on UTF encodings (#8363) + * Ensure theme config is a `Jekyll::Configuration` object (#8988) ### Development Fixes From 1cde234d412765059de8db776c588d1569c95272 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Fri, 8 Apr 2022 18:59:55 +0530 Subject: [PATCH 068/290] Bump RuboCop to `v1.27.x` --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 2145b28b4c9..61028400d26 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ group :test do gem "nokogiri", "~> 1.7" gem "rspec" gem "rspec-mocks" - gem "rubocop", "~> 1.26.0" + gem "rubocop", "~> 1.27.0" gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rake" From 64dbf46a3bba6d25a93e41cd15f3ce76f210aacb Mon Sep 17 00:00:00 2001 From: Emily Grace Seville Date: Sat, 9 Apr 2022 00:22:29 +1000 Subject: [PATCH 069/290] Add clarity to docs on permalinks placeholders and builtins (#8995) Merge pull request 8995 --- docs/_docs/permalinks.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/_docs/permalinks.md b/docs/_docs/permalinks.md index e381e7de0f9..7f1997765c2 100644 --- a/docs/_docs/permalinks.md +++ b/docs/_docs/permalinks.md @@ -278,6 +278,14 @@ Here's the full list of placeholders available:

+ + +

:output_ext

+ + +

Extension of the output file. (Included by default and usually unnecessary.)

+ + @@ -325,7 +333,10 @@ For posts, Jekyll also provides the following built-in styles for convenience: {% include docs_version_badge.html version="4.0" %} -

/:categories/:year/W:week/:short_day/:title:output_ext

+

+ /:categories/:year/W:week/:short_day/:title:output_ext
+ (W will be prefixed to the value of :week) +

From c254533c3b38e78846fef44c6df3ba46fff3bafd Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 8 Apr 2022 07:22:30 -0700 Subject: [PATCH 070/290] Update history to reflect merge of #8995 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index f12d0494f00..840eb77ba43 100644 --- a/History.markdown +++ b/History.markdown @@ -65,6 +65,7 @@ * Simplify macOS installation docs (#8993) * Improve document about Github Actions section (#8853) * Update permalinks.md (#9017) + * Add clarity to docs on permalinks placeholders and builtins (#8995) ### Bug Fixes From 7c28eb5f7ec17f7d8d34d4e37ccbd42ff3fb8daf Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 21 Apr 2022 20:20:49 +0530 Subject: [PATCH 071/290] Bump RuboCop to `v1.28.x` --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 61028400d26..c94ee136e6e 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ group :test do gem "nokogiri", "~> 1.7" gem "rspec" gem "rspec-mocks" - gem "rubocop", "~> 1.27.0" + gem "rubocop", "~> 1.28.0" gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rake" From 6077ed6a01f0e6cbea4e60f6ad28bc22bd0fbd9f Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 28 Apr 2022 12:27:33 +0530 Subject: [PATCH 072/290] Remove misleading total row from `--profile` table (#9039) Merge pull request 9039 --- lib/jekyll/profiler.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/jekyll/profiler.rb b/lib/jekyll/profiler.rb index 0025912cf00..9dd879f1d38 100644 --- a/lib/jekyll/profiler.rb +++ b/lib/jekyll/profiler.rb @@ -14,15 +14,12 @@ def self.tabulate(table_rows) rows = table_rows.dup header = rows.shift - footer = rows.pop output = +"\n" table = Terminal::Table.new do |t| t << header t << :separator rows.each { |row| t << row } - t << :separator - t << footer t.style = TERMINAL_TABLE_STYLES t.align_column(0, :left) end From 124ce72be849a6f2c2994d66a2bb3c33de5cc42e Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 27 Apr 2022 23:57:35 -0700 Subject: [PATCH 073/290] Update history to reflect merge of #9039 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 840eb77ba43..1fdc5e92b48 100644 --- a/History.markdown +++ b/History.markdown @@ -83,6 +83,7 @@ * Trigger livereload in sites without pages (#8337) * Only enable BOM encoding option on UTF encodings (#8363) * Ensure theme config is a `Jekyll::Configuration` object (#8988) + * Remove misleading totals row from `--profile` table (#9039) ### Development Fixes From ac93d22df1d7a2e407533a07810c0c7b3aba70a0 Mon Sep 17 00:00:00 2001 From: Andrew Gutekanst Date: Thu, 28 Apr 2022 08:14:22 -0400 Subject: [PATCH 074/290] Remove git.io shortlinks from repo (#9045) Merge pull request 9045 --- lib/jekyll/commands/doctor.rb | 2 +- lib/jekyll/filters.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb index aa99b66c698..480dd9bd894 100644 --- a/lib/jekyll/commands/doctor.rb +++ b/lib/jekyll/commands/doctor.rb @@ -157,7 +157,7 @@ def url_valid?(url) Addressable::URI.parse(url) true # Addressable::URI#parse only raises a TypeError - # https://git.io/vFfbx + # https://github.com/sporkmonger/addressable/blob/0a0e96acb17225f9b1c9cab0bad332b448934c9a/lib/addressable/uri.rb#L103 rescue TypeError Jekyll.logger.warn "Warning:", "The site URL does not seem to be valid, "\ "check the value of `url` in your config file." diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb index 6c67a05c9c7..7042c0c6f7f 100644 --- a/lib/jekyll/filters.rb +++ b/lib/jekyll/filters.rb @@ -478,7 +478,7 @@ def as_liquid(item) end # ----------- The following set of code was *adapted* from Liquid::If - # ----------- ref: https://git.io/vp6K6 + # ----------- ref: https://github.com/Shopify/liquid/blob/ffb0ace30315bbcf3548a0383fab531452060ae8/lib/liquid/tags/if.rb#L84-L107 # Parse a string to a Liquid Condition def parse_condition(exp) From 2c0e51330b26bb4327882843e27093e3e5f3b686 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 28 Apr 2022 05:14:23 -0700 Subject: [PATCH 075/290] Update history to reflect merge of #9045 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 1fdc5e92b48..635f183f9b7 100644 --- a/History.markdown +++ b/History.markdown @@ -106,6 +106,7 @@ * Check symlink outside site_source without Pathutil (#9015) * Stop testing with Rubies older than 2.7 on non-Windows (#8955) * Bump actions/checkout from 2 to 3 (#8986) + * Remove git.io shortlinks from repo (#9045) ### Minor Enhancements From d70ffd2a205c3e68d89358089ed4efc333db87f7 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 5 May 2022 12:49:26 +0530 Subject: [PATCH 076/290] Fix news-archive list renders on small-devices Resolves #8839 --- docs/_sass/_style.scss | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss index 24694e83f49..b97a8cbc99f 100644 --- a/docs/_sass/_style.scss +++ b/docs/_sass/_style.scss @@ -679,7 +679,8 @@ article h2:first-child { margin-top: 0; } .news article + article { margin-top: -6px; - padding: 15px 40px; + padding-top: 15px; + padding-bottom: 15px; border-top: 1px solid #555; border-radius: 0; @include box-shadow(0 -1px 0 #2f2f2f); @@ -687,24 +688,6 @@ article h2:first-child { margin-top: 0; } h2.post-title { margin-bottom: 0.45em; } - .post-category { - margin-right: 20px; - padding-left: 0; - width: 150px; - box-sizing: border-box; - .label { - float: right; - } - } - .cell-left, .cell-right { - display: inline-block; - } - .cell-left { - max-width: 180px; - } - .cell-right { - width: calc(100% - 130px); - } .post-date { margin-left: 0 } } From 796ae15c31147d1980662744ef0f19a15a27cdee Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 5 May 2022 16:46:09 +0530 Subject: [PATCH 077/290] Fix alignment of home page section-units on mobile --- docs/pages/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pages/index.html b/docs/pages/index.html index 1c27e5cf854..cf8ce9f1f29 100644 --- a/docs/pages/index.html +++ b/docs/pages/index.html @@ -11,7 +11,7 @@ -
+

Simple

From 0f5f5ba8d1f0f4b96b2081764e5df2411ddb9da2 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Mon, 9 May 2022 11:30:27 +0530 Subject: [PATCH 078/290] Bump RuboCop to v1.29.x Closes #9053 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index c94ee136e6e..ffb9c7511f7 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ group :test do gem "nokogiri", "~> 1.7" gem "rspec" gem "rspec-mocks" - gem "rubocop", "~> 1.28.0" + gem "rubocop", "~> 1.29.0" gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rake" From 674bcfb37eac4d8ebdec0f08952aa3ebea3f8c2e Mon Sep 17 00:00:00 2001 From: Takuya N Date: Mon, 16 May 2022 22:51:30 +0900 Subject: [PATCH 079/290] Remove Ionic Framework site from showcase (#9057) Merge pull request 9057 --- docs/_data/showcase.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docs/_data/showcase.yml b/docs/_data/showcase.yml index c7b8836dc89..efa82cd6f51 100644 --- a/docs/_data/showcase.yml +++ b/docs/_data/showcase.yml @@ -292,13 +292,6 @@ - software - marketing-site -- name: Ionic Framework - url: https://ionicframework.com/ - image: ionic-framework.png - categories: - - software - - marketing-site - - name: Spotify for Developers url: https://developer.spotify.com image: spotify-developers.png From 4537ccac41933e649b3471669fd42103e2693a6f Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 16 May 2022 06:51:32 -0700 Subject: [PATCH 080/290] Update history to reflect merge of #9057 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 635f183f9b7..4c443ffe11b 100644 --- a/History.markdown +++ b/History.markdown @@ -66,6 +66,7 @@ * Improve document about Github Actions section (#8853) * Update permalinks.md (#9017) * Add clarity to docs on permalinks placeholders and builtins (#8995) + * Remove Ionic Framework site from showcase (#9057) ### Bug Fixes From 8896e125ef8bb32603f1ebb1cd60d560f8ea7dfa Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 26 May 2022 15:11:58 +0530 Subject: [PATCH 081/290] Bump RuboCop to `v1.30.x` --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index ffb9c7511f7..7e0b9000e00 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ group :test do gem "nokogiri", "~> 1.7" gem "rspec" gem "rspec-mocks" - gem "rubocop", "~> 1.29.0" + gem "rubocop", "~> 1.30.0" gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rake" From 25369429a75b5badc84220d09badef6317760e4c Mon Sep 17 00:00:00 2001 From: Kirstin Heidler Date: Mon, 20 Jun 2022 20:19:37 +0100 Subject: [PATCH 082/290] Windows: describe which option to choose (#9049) Merge pull request 9049 --- docs/_docs/installation/windows.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/_docs/installation/windows.md b/docs/_docs/installation/windows.md index c7d77ed0fbb..6e3e5b1a0c0 100644 --- a/docs/_docs/installation/windows.md +++ b/docs/_docs/installation/windows.md @@ -23,7 +23,8 @@ We only cover RubyInstaller-2.4 and newer here. Older versions need to Use default options for installation. 2. Run the `ridk install` step on the last stage of the installation wizard. This is needed for installing gems with native extensions. You can find additional information regarding this in the - [RubyInstaller Documentation](https://github.com/oneclick/rubyinstaller2#using-the-installer-on-a-target-system) + [RubyInstaller Documentation](https://github.com/oneclick/rubyinstaller2#using-the-installer-on-a-target-system). + From the options choose `MSYS2 and MINGW development tool chain`. 3. Open a new command prompt window from the start menu, so that changes to the `PATH` environment variable becomes effective. Install Jekyll and Bundler using `gem install jekyll bundler` 4. Check if Jekyll has been installed properly: `jekyll -v` From 66dd82064874a77eb0ba93518090cb59979948c3 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 20 Jun 2022 12:19:38 -0700 Subject: [PATCH 083/290] Update history to reflect merge of #9049 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 4c443ffe11b..5c9a7b804f3 100644 --- a/History.markdown +++ b/History.markdown @@ -67,6 +67,7 @@ * Update permalinks.md (#9017) * Add clarity to docs on permalinks placeholders and builtins (#8995) * Remove Ionic Framework site from showcase (#9057) + * Windows: describe which option to choose (#9049) ### Bug Fixes From a0c6b4c59521c40122c33e5b544a386c89c18bd8 Mon Sep 17 00:00:00 2001 From: Andreas Deininger Date: Tue, 21 Jun 2022 05:35:42 +0200 Subject: [PATCH 084/290] Improve links (http -> https) (#9064) Merge pull request 9064 --- .github/first-timers-issue-template.md | 2 +- README.markdown | 2 +- docs/_data/showcase.yml | 16 ++++++++-------- docs/_docs/continuous-integration/buddyworks.md | 2 +- docs/_docs/datafiles.md | 2 +- docs/_docs/deployment/third-party.md | 4 ++-- docs/_docs/includes.md | 2 +- docs/_docs/themes.md | 2 +- docs/pages/index.html | 2 +- docs/pages/jekyllconf.md | 2 +- docs/pages/resources.md | 2 +- lib/jekyll/utils/win_tz.rb | 2 +- test/source/_slides/example-slide-4.html | 4 ++-- .../_tutorials/dive-in-and-publish-already.md | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/first-timers-issue-template.md b/.github/first-timers-issue-template.md index fe48b952315..c7787911a36 100644 --- a/.github/first-timers-issue-template.md +++ b/.github/first-timers-issue-template.md @@ -2,7 +2,7 @@ This issue is reserved for people who never contributed to Open Source before. We know that the process of creating a pull request is the biggest barrier for new contributors. This issue is for you 💝 -[About First Timers Only](http://www.firsttimersonly.com/). +[About First Timers Only](https://www.firsttimersonly.com/). ### 🤔 What you will need to know. diff --git a/README.markdown b/README.markdown index edca8e5775c..ad55a2f3321 100644 --- a/README.markdown +++ b/README.markdown @@ -28,7 +28,7 @@ See: [https://jekyllrb.com/philosophy](https://jekyllrb.com/philosophy) ## Diving In -* [Migrate](http://import.jekyllrb.com/docs/home/) from your previous system +* [Migrate](https://import.jekyllrb.com/docs/home/) from your previous system * Learn how [Front Matter](https://jekyllrb.com/docs/front-matter/) works * Put information on your site with [Variables](https://jekyllrb.com/docs/variables/) * Customize the [Permalinks](https://jekyllrb.com/docs/permalinks/) your posts are generated with diff --git a/docs/_data/showcase.yml b/docs/_data/showcase.yml index efa82cd6f51..a1096663354 100644 --- a/docs/_data/showcase.yml +++ b/docs/_data/showcase.yml @@ -1,5 +1,5 @@ - name: Tom Preston Werner Blog - url: http://tom.preston-werner.com/ + url: https://tom.preston-werner.com/ image: tom-preston-werner.png categories: - personal @@ -26,7 +26,7 @@ - marketing-site - name: Vesterheim Norwegian-American Museum - url: http://vesterheim.org/ + url: https://vesterheim.org/ image: vesterheim.png categories: - marketing-site @@ -139,7 +139,7 @@ - marketing-site - name: Rehan Butt - url: http://rehanbutt.com/ + url: https://rehanbutt.com/ image: rehn.png categories: - personal @@ -178,19 +178,19 @@ - other - name: Digital Democracy - url: http://www.digital-democracy.org/ + url: https://www.digital-democracy.org/ image: digital-democracy.png categories: - other - name: HTML Reference - url: http://htmlreference.io/ + url: https://htmlreference.io/ image: htmlreference.png categories: - documentation - name: CSS Reference - url: http://cssreference.io/ + url: https://cssreference.io/ image: cssreference.png categories: - documentation @@ -272,7 +272,7 @@ - documentation - name: Yeoman - url: http://yeoman.io/ + url: https://yeoman.io/ image: yeoman.png categories: - open-source @@ -308,7 +308,7 @@ - marketing-site - name: Ruby on Rails - url: http://rubyonrails.org/ + url: https://rubyonrails.org/ image: ruby-on-rails.png categories: - marketing-site diff --git a/docs/_docs/continuous-integration/buddyworks.md b/docs/_docs/continuous-integration/buddyworks.md index 5dd43e3ce5e..e342ca97f40 100644 --- a/docs/_docs/continuous-integration/buddyworks.md +++ b/docs/_docs/continuous-integration/buddyworks.md @@ -57,4 +57,4 @@ This entire guide is open-source. Go ahead and [edit it][jekyll-docs-ci-buddy] i [jekyll-docs-ci-buddy]: https://github.com/jekyll/jekyll/edit/master/docs/_docs/continuous-integration/buddyworks.md [jekyll-help]: https://jekyllrb.com/help/ -[buddy-forum]: http://forum.buddy.works/ +[buddy-forum]: https://forum.buddy.works/ diff --git a/docs/_docs/datafiles.md b/docs/_docs/datafiles.md index c78b376ac91..e7ca78b7c79 100644 --- a/docs/_docs/datafiles.md +++ b/docs/_docs/datafiles.md @@ -7,7 +7,7 @@ In addition to the [built-in variables]({{'/docs/variables/' | relative_url }}) you can specify your own custom data that can be accessed via the [Liquid templating system](https://github.com/Shopify/liquid/wiki/Liquid-for-Designers). -Jekyll supports loading data from [YAML](http://yaml.org/), [JSON](http://www.json.org/), [CSV](https://en.wikipedia.org/wiki/Comma-separated_values), and [TSV](https://en.wikipedia.org/wiki/Tab-separated_values) files located in the `_data` directory. +Jekyll supports loading data from [YAML](https://yaml.org), [JSON](https://www.json.org/json-en.html), [CSV](https://en.wikipedia.org/wiki/Comma-separated_values), and [TSV](https://en.wikipedia.org/wiki/Tab-separated_values) files located in the `_data` directory. Note that CSV and TSV files *must* contain a header row. This powerful feature allows you to avoid repetition in your templates and to diff --git a/docs/_docs/deployment/third-party.md b/docs/_docs/deployment/third-party.md index 6420cec529d..41ca6ee1cc0 100644 --- a/docs/_docs/deployment/third-party.md +++ b/docs/_docs/deployment/third-party.md @@ -35,9 +35,9 @@ The [Jekyll hosting tutorial](https://www.keycdn.com/support/jekyll-hosting) pro ## Kickster -Use [Kickster](http://kickster.nielsenramon.com/) for automated deploys to GitHub Pages when using unsupported plugins on GitHub Pages. +Use [Kickster](https://kickster.nielsenramon.com/) for automated deploys to GitHub Pages when using unsupported plugins on GitHub Pages. -Kickster provides a basic Jekyll project setup packed with web best practises and useful optimization tools increasing your overall project quality. Kickster ships with automated and worry-free deployment scripts for GitHub Pages. +Kickster provides a basic Jekyll project setup packed with web best practices and useful optimization tools increasing your overall project quality. Kickster ships with automated and worry-free deployment scripts for GitHub Pages. Install the Kickster gem and you are good to go. More documentation can here found [here](https://github.com/nielsenramon/kickster#kickster). If you do not want to use the gem or start a new project you can just copy paste the deployment scripts for [Travis CI](https://github.com/nielsenramon/kickster/tree/master/snippets/travis) or [Circle CI](https://github.com/nielsenramon/kickster#automated-deployment-with-circle-ci). diff --git a/docs/_docs/includes.md b/docs/_docs/includes.md index 2112a6b067b..8409942ab21 100644 --- a/docs/_docs/includes.md +++ b/docs/_docs/includes.md @@ -85,7 +85,7 @@ For example, suppose you have a special image syntax with complex formatting, an ```html
- + Jekyll logo diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md index dc542ab9b6a..61916cc9b67 100644 --- a/docs/_docs/themes.md +++ b/docs/_docs/themes.md @@ -394,4 +394,4 @@ Themes are published via [RubyGems.org](https://rubygems.org). You will need a R gem push jekyll-theme-awesome-*.gem ``` -4. To release a new version of your theme, update the version number in the gemspec file, ( `jekyll-theme-awesome.gemspec` in this example ), and then repeat Steps 1 - 3 above. We recommend that you follow [Semantic Versioning](http://semver.org/) while bumping your theme-version. +4. To release a new version of your theme, update the version number in the gemspec file, ( `jekyll-theme-awesome.gemspec` in this example ), and then repeat Steps 1 - 3 above. We recommend that you follow [Semantic Versioning](https://semver.org) while bumping your theme-version. diff --git a/docs/pages/index.html b/docs/pages/index.html index cf8ce9f1f29..971b8187dda 100644 --- a/docs/pages/index.html +++ b/docs/pages/index.html @@ -30,7 +30,7 @@

Blog-aware

Permalinks, categories, pages, posts, and custom layouts are all first-class citizens here.

- Migrate your blog → + Migrate your blog →
diff --git a/docs/pages/jekyllconf.md b/docs/pages/jekyllconf.md index 918103d4123..2b6ac792e06 100644 --- a/docs/pages/jekyllconf.md +++ b/docs/pages/jekyllconf.md @@ -4,7 +4,7 @@ title: JekyllConf permalink: /jekyllconf/ --- -[JekyllConf](http://jekyllconf.com) is a free, online conference for all things Jekyll hosted by [CloudCannon](http://cloudcannon.com). Each year members of the Jekyll community speak about interesting use cases, tricks they've learned, or meta Jekyll topics. +[JekyllConf](https://jekyllconf.com) is a free, online conference for all things Jekyll hosted by [CloudCannon](https://cloudcannon.com). Each year members of the Jekyll community speak about interesting use cases, tricks they've learned, or meta Jekyll topics. ## Featured diff --git a/docs/pages/resources.md b/docs/pages/resources.md index 543dc81b804..0b2be7522ec 100644 --- a/docs/pages/resources.md +++ b/docs/pages/resources.md @@ -91,7 +91,7 @@ Use a SaaS service as a backend for functionality on your Jekyll site > "Jekyll is everything that I ever wanted in a blogging engine. Really. It isn't perfect, but what's excellent about it is that if there's something wrong, I know exactly how it works and how to fix it. It runs on the your machine only, and is essentially an added"build" step between you and the browser. I coded this entire site in TextMate using standard HTML5 and CSS3, and then at the end I added just a few little variables to the markup. Presto-chango, my site is built and I am at peace with the world." - A way to [extend Jekyll](https://github.com/rfelix/jekyll_ext) without forking and modifying the Jekyll gem codebase and some [portable Jekyll extensions](https://github.com/rfelix/jekyll_ext/wiki/Extensions) that can be reused and shared. -- [Using your Rails layouts in Jekyll](http://numbers.brighterplanet.com/2010/08/09/sharing-rails-views-with-jekyll) +- [Using your Rails layouts in Jekyll](https://numbers.brighterplanet.com/2010/08/09/sharing-rails-views-with-jekyll) ## Forks diff --git a/lib/jekyll/utils/win_tz.rb b/lib/jekyll/utils/win_tz.rb index d6ffad43bd5..ad277d3a6a5 100644 --- a/lib/jekyll/utils/win_tz.rb +++ b/lib/jekyll/utils/win_tz.rb @@ -25,7 +25,7 @@ def calculate(timezone, now = Time.now) # e.g. Eastern Standard Time (EST) that is 5Hrs. to the 'west' of Prime Meridian # is denoted as: # EST+5 (or) EST+05:00 - # Reference: http://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html + # Reference: https://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html sign = offset.positive? ? "-" : "+" rational_hours = offset.abs.to_r / 3600 diff --git a/test/source/_slides/example-slide-4.html b/test/source/_slides/example-slide-4.html index 192b5135250..9feabf687e0 100644 --- a/test/source/_slides/example-slide-4.html +++ b/test/source/_slides/example-slide-4.html @@ -5,8 +5,8 @@ Jekyll is a simple, blog-aware, static site generator. It takes a template directory containing raw text files in various formats, runs it through -[Markdown](http://daringfireball.net/projects/markdown/) (or -[Textile](http://redcloth.org/textile)) and +[Markdown](https://daringfireball.net/projects/markdown/) (or +[Textile](https://www.promptworks.com/textile)) and [Liquid](https://help.shopify.com/themes/liquid/basics) converters, and spits out a complete, ready-to-publish static website suitable for serving with your favorite web server. Jekyll also happens to be the engine diff --git a/test/source/_tutorials/dive-in-and-publish-already.md b/test/source/_tutorials/dive-in-and-publish-already.md index d6a7397a517..bb94e0fa7a0 100644 --- a/test/source/_tutorials/dive-in-and-publish-already.md +++ b/test/source/_tutorials/dive-in-and-publish-already.md @@ -5,5 +5,5 @@ approx_time: 30 mins --- Jekyll converts Markdown documents to HTML by default. Don't know what's Markdown? -Read this [documentation](http://daringfireball.net/projects/markdown/) +Read this [documentation](https://daringfireball.net/projects/markdown/) While you're at it, might as well learn about [Kramdown](https://kramdown.gettalong.org/) From 3d23171d2257b5db520bacc1ada5095efa9a8cb0 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 20 Jun 2022 20:35:43 -0700 Subject: [PATCH 085/290] Update history to reflect merge of #9064 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 5c9a7b804f3..a34d679056b 100644 --- a/History.markdown +++ b/History.markdown @@ -68,6 +68,7 @@ * Add clarity to docs on permalinks placeholders and builtins (#8995) * Remove Ionic Framework site from showcase (#9057) * Windows: describe which option to choose (#9049) + * Improve links (http -> https) (#9064) ### Bug Fixes From 18e5e5223bdfb0f22d2e45180a50b6352c9162ea Mon Sep 17 00:00:00 2001 From: Andrii Abramov Date: Thu, 14 Jul 2022 02:45:36 +0300 Subject: [PATCH 086/290] Update ruby version for macos guide (#9086) Merge pull request 9086 --- docs/_data/ruby.yml | 4 ++-- docs/_docs/installation/macos.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/_data/ruby.yml b/docs/_data/ruby.yml index 527b7b14410..3655def7c1a 100644 --- a/docs/_data/ruby.yml +++ b/docs/_data/ruby.yml @@ -1,3 +1,3 @@ min_version: 2.5.0 -current_version: 3.1.1 -current_version_output: ruby 3.1.1p18 (2022-02-18 revision 53f5fc4236) +current_version: 3.1.2 +current_version_output: ruby 3.1.2p20 (2022-04-12 revision 4491bb740a) diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md index 819ed8fb947..259c7dcd166 100644 --- a/docs/_docs/installation/macos.md +++ b/docs/_docs/installation/macos.md @@ -63,7 +63,7 @@ automatically use `chruby`: ```sh echo "source $(brew --prefix)/opt/chruby/share/chruby/chruby.sh" >> ~/.zshrc echo "source $(brew --prefix)/opt/chruby/share/chruby/auto.sh" >> ~/.zshrc -echo "chruby ruby-{{ site.data.ruby.current_version }}" >> ~/.zshrc +echo "chruby ruby-{{ site.data.ruby.current_version }}" >> ~/.zshrc # run 'chruby' to see actual version ``` If you're using Bash, replace `.zshrc` with `.bash_profile`. If you're not sure, From a03e972378ebec1b836d0d7fe1658131d16a9a79 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 13 Jul 2022 16:45:38 -0700 Subject: [PATCH 087/290] Update history to reflect merge of #9086 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index a34d679056b..022d0d9c2c7 100644 --- a/History.markdown +++ b/History.markdown @@ -69,6 +69,7 @@ * Remove Ionic Framework site from showcase (#9057) * Windows: describe which option to choose (#9049) * Improve links (http -> https) (#9064) + * Update ruby version for macos guide (#9086) ### Bug Fixes From 7a698d4d142ebc260ca1986839170397273fb4a0 Mon Sep 17 00:00:00 2001 From: Nemo Date: Mon, 1 Aug 2022 19:51:34 +0530 Subject: [PATCH 088/290] Bump rubocop to 1.32 (#9093) Merge pull request 9093 --- .rubocop.yml | 2 +- Gemfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index ffdaffa31ff..69c279c9d27 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -25,7 +25,7 @@ AllCops: - vendor/**/* - tmp/**/* -Gemspec/DateAssignment: +Gemspec/DeprecatedAttributeAssignment: Enabled: true Layout/BeginEndAlignment: Enabled: true diff --git a/Gemfile b/Gemfile index 7e0b9000e00..3053fcbacfc 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ group :test do gem "nokogiri", "~> 1.7" gem "rspec" gem "rspec-mocks" - gem "rubocop", "~> 1.30.0" + gem "rubocop", "~> 1.32.0" gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rake" From d2c7c43c3fd3e67bf22c67d633f311194523ead8 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 1 Aug 2022 07:21:36 -0700 Subject: [PATCH 089/290] Update history to reflect merge of #9093 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 022d0d9c2c7..4e08e4e7d88 100644 --- a/History.markdown +++ b/History.markdown @@ -111,6 +111,7 @@ * Stop testing with Rubies older than 2.7 on non-Windows (#8955) * Bump actions/checkout from 2 to 3 (#8986) * Remove git.io shortlinks from repo (#9045) + * Bump rubocop to 1.32 (#9093) ### Minor Enhancements From 911e249d72248ca8f8a945dd345aadf9f58aeea5 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Wed, 21 Sep 2022 22:55:50 +0530 Subject: [PATCH 090/290] Bump RuboCop to `1.36.x` (#9125) Merge pull request 9125 --- .rubocop.yml | 67 ++++++++++++++++++- Gemfile | 2 +- lib/jekyll/commands/build.rb | 4 +- lib/jekyll/commands/clean.rb | 3 +- lib/jekyll/commands/doctor.rb | 24 +++---- lib/jekyll/commands/new.rb | 12 ++-- lib/jekyll/commands/new_theme.rb | 7 +- lib/jekyll/commands/serve.rb | 30 ++++----- .../commands/serve/live_reload_reactor.rb | 2 +- lib/jekyll/commands/serve/servlet.rb | 2 +- lib/jekyll/configuration.rb | 4 +- .../converters/markdown/kramdown_parser.rb | 2 +- lib/jekyll/excerpt.rb | 4 +- lib/jekyll/filters.rb | 2 +- lib/jekyll/hooks.rb | 4 +- lib/jekyll/plugin_manager.rb | 7 +- lib/jekyll/renderer.rb | 4 +- lib/jekyll/site.rb | 14 ++-- lib/jekyll/tags/highlight.rb | 4 +- lib/jekyll/tags/include.rb | 4 +- lib/jekyll/tags/post_url.rb | 10 +-- lib/jekyll/theme.rb | 4 +- lib/jekyll/url.rb | 2 +- lib/jekyll/utils/ansi.rb | 2 +- test/helper.rb | 5 +- test/test_commands_serve.rb | 4 +- test/test_doctor_command.rb | 8 ++- test/test_excerpt.rb | 9 ++- test/test_page_without_a_file.rb | 4 +- test/test_regenerator.rb | 4 +- test/test_site.rb | 4 +- test/test_tags.rb | 14 ++-- test/test_theme_assets_reader.rb | 9 ++- 33 files changed, 167 insertions(+), 114 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 69c279c9d27..8e3114500af 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -27,6 +27,9 @@ AllCops: Gemspec/DeprecatedAttributeAssignment: Enabled: true +Gemspec/RequireMFA: + Enabled: false + Layout/BeginEndAlignment: Enabled: true Layout/EmptyComment: @@ -43,6 +46,12 @@ Layout/HashAlignment: EnforcedHashRocketStyle: table Layout/IndentationWidth: Severity: error +Layout/LineContinuationLeadingSpace: + Enabled: true +Layout/LineContinuationSpacing: + Enabled: true +Layout/LineEndStringConcatenationIndentation: + Enabled: true Layout/LineLength: Exclude: - !ruby/regexp /features\/.*.rb/ @@ -66,12 +75,18 @@ Layout/SpaceInsideHashLiteralBraces: Lint/AmbiguousAssignment: Enabled: true +Lint/AmbiguousOperatorPrecedence: + Enabled: true +Lint/AmbiguousRange: + Enabled: true Lint/BinaryOperatorWithIdenticalOperands: Enabled: true Lint/ConstantDefinitionInBlock: Enabled: true Exclude: - test/**/*.rb +Lint/ConstantOverwrittenInRescue: + Enabled: true Lint/DeprecatedConstants: Enabled: true Lint/DeprecatedOpenSSLConstant: @@ -123,6 +138,10 @@ Lint/RedundantDirGlobSort: Enabled: true Lint/RedundantSafeNavigation: Enabled: true +Lint/RequireRangeParentheses: + Enabled: true +Lint/RequireRelativeSelfPath: + Enabled: true Lint/SelfAssignment: Enabled: true Lint/StructNewOverride: @@ -187,6 +206,8 @@ Metrics/ParameterLists: Metrics/PerceivedComplexity: Max: 13 +Minitest/AssertEmptyLiteral: + Enabled: false Minitest/AssertInDelta: Enabled: true Minitest/AssertionInLifecycleHook: @@ -199,6 +220,8 @@ Minitest/AssertPathExists: Enabled: true Minitest/AssertSilent: Enabled: true +Minitest/AssertWithExpectedArgument: + Enabled: true Minitest/LiteralAsActualArgument: Enabled: true Minitest/TestMethodName: @@ -211,10 +234,10 @@ Minitest/RefuteKindOf: Enabled: true Minitest/RefutePathExists: Enabled: true +Minitest/UnreachableAssertion: + Enabled: true Minitest/UnspecifiedException: Enabled: true -Minitest/AssertEmptyLiteral: - Enabled: false Naming/FileName: Enabled: false @@ -242,10 +265,16 @@ Performance/CollectionLiteralInLoop: Enabled: true Performance/ConstantRegexp: Enabled: true +Performance/MapCompact: + Enabled: true Performance/MethodObjectAsBlock: Enabled: true +Performance/RedundantEqualityComparisonBlock: + Enabled: false Performance/RedundantSortBlock: Enabled: true +Performance/RedundantSplitRegexpArgument: + Enabled: true Performance/RedundantStringChars: Enabled: true Performance/ReverseFirst: @@ -254,6 +283,8 @@ Performance/SortReverse: Enabled: false Performance/Squeeze: Enabled: true +Performance/StringIdentifierArgument: + Enabled: true Performance/StringInclude: Enabled: true Exclude: @@ -261,6 +292,10 @@ Performance/StringInclude: Performance/Sum: Enabled: true +Security/CompoundHash: + Enabled: true +Security/IoMethods: + Enabled: true Security/MarshalLoad: Exclude: - !ruby/regexp /test\/.*.rb$/ @@ -303,12 +338,20 @@ Style/Documentation: Enabled: false Style/DoubleNegation: Enabled: false +Style/EmptyHeredoc: + Enabled: true Style/EndlessMethod: Enabled: true Style/ExplicitBlockArgument: Enabled: false Style/ExponentialNotation: Enabled: true +Style/EnvHome: + Enabled: true +Style/FetchEnvVar: + Enabled: false +Style/FileRead: + Enabled: false Style/FormatStringToken: Exclude: - lib/jekyll/utils/ansi.rb @@ -316,6 +359,8 @@ Style/FormatStringToken: - lib/jekyll/profiler.rb Style/FrozenStringLiteralComment: EnforcedStyle: always +Style/FileWrite: + Enabled: true Style/GlobalStdStream: Enabled: true Style/GuardClause: @@ -341,6 +386,12 @@ Style/IfWithBooleanLiteralBranches: Enabled: true Style/KeywordParametersOrder: Enabled: true +Style/MagicCommentFormat: + Enabled: true +Style/MapCompactWithConditionalBlock: + Enabled: true +Style/MapToHash: + Enabled: true Style/MixinUsage: Exclude: - test/helper.rb @@ -350,10 +401,14 @@ Style/MultilineTernaryOperator: Severity: error Style/NegatedIfElseCondition: Enabled: true +Style/NestedFileDirname: + Enabled: true Style/NilLambda: Enabled: true Style/OptionalBooleanParameter: Enabled: true + Exclude: + - lib/jekyll/log_adapter.rb Style/PercentLiteralDelimiters: PreferredDelimiters: "%Q": "{}" @@ -363,6 +418,8 @@ Style/PercentLiteralDelimiters: "%s": () "%w": () "%x": () +Style/QuotedSymbols: + Enabled: true Style/RedundantArgument: Enabled: true Style/RedundantAssignment: @@ -371,12 +428,18 @@ Style/RedundantFetchBlock: Enabled: false Style/RedundantFileExtensionInRequire: Enabled: true +Style/RedundantInitialize: + Enabled: true + Exclude: + - lib/jekyll/plugin.rb Style/RedundantRegexpCharacterClass: Enabled: true Style/RedundantRegexpEscape: Enabled: true Style/RedundantSelfAssignment: Enabled: true +Style/RedundantSelfAssignmentBranch: + Enabled: true Style/RegexpLiteral: EnforcedStyle: percent_r Style/RescueModifier: diff --git a/Gemfile b/Gemfile index 3053fcbacfc..66575a7eef0 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ group :test do gem "nokogiri", "~> 1.7" gem "rspec" gem "rspec-mocks" - gem "rubocop", "~> 1.32.0" + gem "rubocop", "~> 1.36.0" gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rake" diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb index 7fc6dfa7918..204b2a12632 100644 --- a/lib/jekyll/commands/build.rb +++ b/lib/jekyll/commands/build.rb @@ -30,8 +30,8 @@ def process(options) site = Jekyll::Site.new(options) if options.fetch("skip_initial_build", false) - Jekyll.logger.warn "Build Warning:", "Skipping the initial build." \ - " This may result in an out-of-date site." + Jekyll.logger.warn "Build Warning:", + "Skipping the initial build. This may result in an out-of-date site." else build(site, options) end diff --git a/lib/jekyll/commands/clean.rb b/lib/jekyll/commands/clean.rb index 9bebd5176bf..9b657a49a07 100644 --- a/lib/jekyll/commands/clean.rb +++ b/lib/jekyll/commands/clean.rb @@ -7,8 +7,7 @@ class << self def init_with_program(prog) prog.command(:clean) do |c| c.syntax "clean [subcommand]" - c.description "Clean the site " \ - "(removes site output and metadata file) without building." + c.description "Clean the site (removes site output and metadata file) without building." add_build_options(c) diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb index 480dd9bd894..7e0129367be 100644 --- a/lib/jekyll/commands/doctor.rb +++ b/lib/jekyll/commands/doctor.rb @@ -53,14 +53,14 @@ def properly_gathered_posts?(site) "Detected '_posts' directory outside custom `collections_dir`!" Jekyll.logger.warn "", "Please move '#{posts_at_root}' into the custom directory at " \ - "'#{site.in_source_dir(site.config["collections_dir"])}'" + "'#{site.in_source_dir(site.config["collections_dir"])}'" false end def deprecated_relative_permalinks(site) if site.config["relative_permalinks"] - Jekyll::Deprecator.deprecation_message "Your site still uses relative permalinks," \ - " which was removed in Jekyll v3.0.0." + Jekyll::Deprecator.deprecation_message "Your site still uses relative permalinks, " \ + "which was removed in Jekyll v3.0.0." true end end @@ -105,9 +105,9 @@ def urls_only_differ_by_case(site) next unless real_urls.uniq.size > 1 urls_only_differ_by_case = true - Jekyll.logger.warn "Warning:", "The following URLs only differ" \ - " by case. On a case-insensitive file system one of the URLs" \ - " will be overwritten by the other: #{real_urls.join(", ")}" + Jekyll.logger.warn "Warning:", "The following URLs only differ by case. On a " \ + "case-insensitive file system one of the URLs will be " \ + "overwritten by the other: #{real_urls.join(", ")}" end urls_only_differ_by_case end @@ -148,8 +148,8 @@ def case_insensitive_urls(things, destination) def url_exists?(url) return true unless url.nil? || url.empty? - Jekyll.logger.warn "Warning:", "You didn't set an URL in the config file, "\ - "you may encounter problems with some plugins." + Jekyll.logger.warn "Warning:", "You didn't set an URL in the config file, you may " \ + "encounter problems with some plugins." false end @@ -159,16 +159,16 @@ def url_valid?(url) # Addressable::URI#parse only raises a TypeError # https://github.com/sporkmonger/addressable/blob/0a0e96acb17225f9b1c9cab0bad332b448934c9a/lib/addressable/uri.rb#L103 rescue TypeError - Jekyll.logger.warn "Warning:", "The site URL does not seem to be valid, "\ - "check the value of `url` in your config file." + Jekyll.logger.warn "Warning:", "The site URL does not seem to be valid, " \ + "check the value of `url` in your config file." false end def url_absolute(url) return true if url.is_a?(String) && Addressable::URI.parse(url).absolute? - Jekyll.logger.warn "Warning:", "Your site URL does not seem to be absolute, "\ - "check the value of `url` in your config file." + Jekyll.logger.warn "Warning:", "Your site URL does not seem to be absolute, " \ + "check the value of `url` in your config file." false end end diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb index f85026baf56..0a00f263484 100644 --- a/lib/jekyll/commands/new.rb +++ b/lib/jekyll/commands/new.rb @@ -28,8 +28,8 @@ def process(args, options = {}) FileUtils.mkdir_p new_blog_path if preserve_source_location?(new_blog_path, options) Jekyll.logger.error "Conflict:", "#{new_blog_path} exists and is not empty." - Jekyll.logger.abort_with "", "Ensure #{new_blog_path} is empty or else " \ - "try again with `--force` to proceed and overwrite any files." + Jekyll.logger.abort_with "", "Ensure #{new_blog_path} is empty or else try again " \ + "with `--force` to proceed and overwrite any files." end if options["blank"] @@ -108,13 +108,9 @@ def gemfile_contents def create_site(new_blog_path) create_sample_files new_blog_path - File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f| - f.write(scaffold_post_content) - end + File.write(File.expand_path(initialized_post_name, new_blog_path), scaffold_post_content) - File.open(File.expand_path("Gemfile", new_blog_path), "w") do |f| - f.write(gemfile_contents) - end + File.write(File.expand_path("Gemfile", new_blog_path), gemfile_contents) end def preserve_source_location?(path, options) diff --git a/lib/jekyll/commands/new_theme.rb b/lib/jekyll/commands/new_theme.rb index f42514700fb..3419d175b0c 100644 --- a/lib/jekyll/commands/new_theme.rb +++ b/lib/jekyll/commands/new_theme.rb @@ -10,8 +10,7 @@ def init_with_program(prog) prog.command(:"new-theme") do |c| c.syntax "new-theme NAME" c.description "Creates a new Jekyll theme scaffold" - c.option "code_of_conduct", \ - "-c", "--code-of-conduct", \ + c.option "code_of_conduct", "-c", "--code-of-conduct", "Include a Code of Conduct. (defaults to false)" c.action do |args, opts| @@ -30,8 +29,8 @@ def process(args, opts) Jekyll.logger.abort_with "Conflict:", "#{theme.path} already exists." if theme.path.exist? theme.create! - Jekyll.logger.info "Your new Jekyll theme, #{theme.name.cyan}," \ - " is ready for you in #{theme.path.to_s.cyan}!" + Jekyll.logger.info "Your new Jekyll theme, #{theme.name.cyan}, " \ + "is ready for you in #{theme.path.to_s.cyan}!" Jekyll.logger.info "For help getting started, read #{theme.path}/README.md." end end diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index 2bb9c8c1953..4600130f45c 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -21,11 +21,11 @@ class << self "ssl_key" => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."], "port" => ["-P", "--port [PORT]", "Port to listen on"], "show_dir_listing" => ["--show-dir-listing", - "Show a directory listing instead of loading" \ - " your index file.",], + "Show a directory listing instead of loading " \ + "your index file.",], "skip_initial_build" => ["skip_initial_build", "--skip-initial-build", - "Skips the initial site build which occurs before" \ - " the server is started.",], + "Skips the initial site build which occurs before " \ + "the server is started.",], "livereload" => ["-l", "--livereload", "Use LiveReload to automatically refresh browsers",], "livereload_ignore" => ["--livereload-ignore ignore GLOB1[,GLOB2[,...]]", @@ -113,8 +113,8 @@ def shutdown def validate_options(opts) if opts["livereload"] if opts["detach"] - Jekyll.logger.warn "Warning:", "--detach and --livereload are mutually exclusive." \ - " Choosing --livereload" + Jekyll.logger.warn "Warning:", "--detach and --livereload are mutually exclusive. " \ + "Choosing --livereload" opts["detach"] = false end if opts["ssl_cert"] || opts["ssl_key"] @@ -132,9 +132,9 @@ def validate_options(opts) livereload_max_delay livereload_ignore livereload_port).any? { |o| opts[o] } - Jekyll.logger.abort_with "--livereload-min-delay, "\ - "--livereload-max-delay, --livereload-ignore, and "\ - "--livereload-port require the --livereload option." + Jekyll.logger.abort_with "--livereload-min-delay, --livereload-max-delay, " \ + "--livereload-ignore, and --livereload-port require " \ + "the --livereload option." end end @@ -174,7 +174,8 @@ def register_reload_hooks(opts) # Do a base pre-setup of WEBRick so that everything is in place # when we get ready to party, checking for an setting up an error page # and making sure our destination exists. - + # + # rubocop:disable Security/IoMethods def setup(destination) require_relative "serve/servlet" @@ -188,6 +189,7 @@ def create_error_page end end end + # rubocop:enable Security/IoMethods def webrick_opts(opts) opts = { @@ -263,8 +265,7 @@ def launch_browser(server, opts) return system "xdg-open", address if Utils::Platforms.linux? return system "open", address if Utils::Platforms.osx? - Jekyll.logger.error "Refusing to launch browser; " \ - "Platform launcher unknown." + Jekyll.logger.error "Refusing to launch browser. Platform launcher unknown." end # Keep in our area with a thread or detach the server as requested @@ -277,9 +278,8 @@ def boot_or_detach(server, opts) end Process.detach(pid) - Jekyll.logger.info "Server detached with pid '#{pid}'.", \ - "Run `pkill -f jekyll' or `kill -9 #{pid}'" \ - " to stop the server." + Jekyll.logger.info "Server detached with pid '#{pid}'.", + "Run `pkill -f jekyll' or `kill -9 #{pid}' to stop the server." else t = Thread.new { server.start } trap("INT") { server.shutdown } diff --git a/lib/jekyll/commands/serve/live_reload_reactor.rb b/lib/jekyll/commands/serve/live_reload_reactor.rb index e79a876a71e..78f9408f1dd 100644 --- a/lib/jekyll/commands/serve/live_reload_reactor.rb +++ b/lib/jekyll/commands/serve/live_reload_reactor.rb @@ -110,7 +110,7 @@ def print_message(json_message) def log_error(error) Jekyll.logger.error "LiveReload experienced an error. " \ - "Run with --trace for more information." + "Run with --trace for more information." raise error end end diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb index d91f871f656..c8895e57011 100644 --- a/lib/jekyll/commands/serve/servlet.rb +++ b/lib/jekyll/commands/serve/servlet.rb @@ -128,7 +128,7 @@ def livereload_args class Servlet < WEBrick::HTTPServlet::FileHandler DEFAULTS = { "Cache-Control" => "private, max-age=0, proxy-revalidate, " \ - "no-store, no-cache, must-revalidate", + "no-store, no-cache, must-revalidate", }.freeze def initialize(server, root, callbacks) diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index c7acb383f89..9b2fbffc2c2 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -304,8 +304,8 @@ def check_plugins(config) return if config["plugins"].is_a?(Array) Jekyll.logger.error "'plugins' should be set as an array of gem-names, but was: " \ - "#{config["plugins"].inspect}. Use 'plugins_dir' instead to set the directory " \ - "for your non-gemified Ruby plugins." + "#{config["plugins"].inspect}. Use 'plugins_dir' instead to set " \ + "the directory for your non-gemified Ruby plugins." raise Jekyll::Errors::InvalidConfigurationError, "'plugins' should be set as an array, but was: #{config["plugins"].inspect}." end diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb index 6751480739e..1e6a1dedecd 100644 --- a/lib/jekyll/converters/markdown/kramdown_parser.rb +++ b/lib/jekyll/converters/markdown/kramdown_parser.rb @@ -1,4 +1,4 @@ -# Frozen-string-literal: true +# frozen_string_literal: true module Kramdown # A Kramdown::Document subclass meant to optimize memory usage from initializing diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb index a406951e768..63185203a13 100644 --- a/lib/jekyll/excerpt.rb +++ b/lib/jekyll/excerpt.rb @@ -190,8 +190,8 @@ def liquid_block?(tag_name) def print_build_warning Jekyll.logger.warn "Warning:", "Excerpt modified in #{doc.relative_path}!" - Jekyll.logger.warn "", "Found a Liquid block containing the excerpt separator" \ - " #{doc.excerpt_separator.inspect}. " + Jekyll.logger.warn "", "Found a Liquid block containing the excerpt separator " \ + "#{doc.excerpt_separator.inspect}." Jekyll.logger.warn "", "The block has been modified with the appropriate closing tag." Jekyll.logger.warn "", "Feel free to define a custom excerpt or excerpt_separator in the" Jekyll.logger.warn "", "document's Front Matter if the generated excerpt is unsatisfactory." diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb index 7042c0c6f7f..5422d52a492 100644 --- a/lib/jekyll/filters.rb +++ b/lib/jekyll/filters.rb @@ -311,7 +311,7 @@ def sort(input, property = nil, nils = "first") order = + 1 else raise ArgumentError, "Invalid nils order: " \ - "'#{nils}' is not a valid nils order. It must be 'first' or 'last'." + "'#{nils}' is not a valid nils order. It must be 'first' or 'last'." end sort_input(input, property, order) diff --git a/lib/jekyll/hooks.rb b/lib/jekyll/hooks.rb index efb852690c1..482d802614f 100644 --- a/lib/jekyll/hooks.rb +++ b/lib/jekyll/hooks.rb @@ -78,8 +78,8 @@ def self.register_one(owner, event, priority, &block) } unless @registry[owner][event] - raise NotAvailable, "Invalid hook. #{owner} supports only the " \ - "following hooks #{@registry[owner].keys.inspect}" + raise NotAvailable, "Invalid hook. #{owner} supports only the following hooks " \ + "#{@registry[owner].keys.inspect}" end raise Uncallable, "Hooks must respond to :call" unless block.respond_to? :call diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb index fe2e43f9904..84c555ab670 100644 --- a/lib/jekyll/plugin_manager.rb +++ b/lib/jekyll/plugin_manager.rb @@ -113,9 +113,10 @@ def deprecation_checks pagination_included = (site.config["plugins"] || []).include?("jekyll-paginate") || defined?(Jekyll::Paginate) if site.config["paginate"] && !pagination_included - Jekyll::Deprecator.deprecation_message "You appear to have pagination " \ - "turned on, but you haven't included the `jekyll-paginate` gem. " \ - "Ensure you have `plugins: [jekyll-paginate]` in your configuration file." + Jekyll::Deprecator.deprecation_message <<~MSG + You appear to have pagination turned on, but you haven't included the `jekyll-paginate` + gem. Ensure you have `plugins: [jekyll-paginate]` in your configuration file. + MSG end end end diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb index ddf078fdfc0..c365a0d7289 100644 --- a/lib/jekyll/renderer.rb +++ b/lib/jekyll/renderer.rb @@ -105,7 +105,7 @@ def convert(content) converter.convert output rescue StandardError => e Jekyll.logger.error "Conversion error:", - "#{converter.class} encountered an error while "\ + "#{converter.class} encountered an error while " \ "converting '#{document.relative_path}':" Jekyll.logger.error("", e.to_s) raise e @@ -179,7 +179,7 @@ def validate_layout(layout) return unless invalid_layout?(layout) Jekyll.logger.warn "Build Warning:", "Layout '#{document.data["layout"]}' requested " \ - "in #{document.relative_path} does not exist." + "in #{document.relative_path} does not exist." end # Render layout content into document.output diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index abd75883bad..2fad097be3e 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -328,11 +328,11 @@ def instantiate_subclasses(klass) # Returns def relative_permalinks_are_deprecated if config["relative_permalinks"] - Jekyll.logger.abort_with "Since v3.0, permalinks for pages" \ - " in subfolders must be relative to the" \ - " site source directory, not the parent" \ - " directory. Check https://jekyllrb.com/docs/upgrading/"\ - " for more info." + Jekyll.logger.abort_with "Since v3.0, permalinks for pages " \ + "in subfolders must be relative to the " \ + "site source directory, not the parent " \ + "directory. Check https://jekyllrb.com/docs/upgrading/ " \ + "for more info." end end @@ -536,8 +536,8 @@ def configure_theme if config["theme"].is_a?(String) Jekyll::Theme.new(config["theme"]) else - Jekyll.logger.warn "Theme:", "value of 'theme' in config should be " \ - "String to use gem-based themes, but got #{config["theme"].class}" + Jekyll.logger.warn "Theme:", "value of 'theme' in config should be String to use " \ + "gem-based themes, but got #{config["theme"].class}" nil end end diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb index 7b7f3d2e1aa..806665e3f4c 100644 --- a/lib/jekyll/tags/highlight.rb +++ b/lib/jekyll/tags/highlight.rb @@ -104,8 +104,8 @@ def add_code_tag(code) "class=\"language-#{@lang.to_s.tr("+", "-")}\"", "data-lang=\"#{@lang}\"", ].join(" ") - "
"\
-        "#{code.chomp}
" + "
" \
+          "#{code.chomp}
" end end end diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb index 058d8280992..6960952ef9f 100644 --- a/lib/jekyll/tags/include.rb +++ b/lib/jekyll/tags/include.rb @@ -179,8 +179,8 @@ def read_file(file, context) private def could_not_locate_message(file, includes_dirs, safe) - message = "Could not locate the included file '#{file}' in any of "\ - "#{includes_dirs}. Ensure it exists in one of those directories and" + message = "Could not locate the included file '#{file}' in any of #{includes_dirs}. " \ + "Ensure it exists in one of those directories and" message + if safe " is not a symlink as those are not allowed in safe mode." else diff --git a/lib/jekyll/tags/post_url.rb b/lib/jekyll/tags/post_url.rb index 874dd643902..7774d37709b 100644 --- a/lib/jekyll/tags/post_url.rb +++ b/lib/jekyll/tags/post_url.rb @@ -86,11 +86,11 @@ def render(context) site.posts.docs.each do |document| next unless @post.deprecated_equality document - Jekyll::Deprecator.deprecation_message "A call to "\ - "'{% post_url #{@post.name} %}' did not match " \ - "a post using the new matching method of checking name " \ - "(path-date-slug) equality. Please make sure that you " \ - "change this tag to match the post's name exactly." + Jekyll::Deprecator.deprecation_message( + "A call to '{% post_url #{@post.name} %}' did not match a post using the new " \ + "matching method of checking name (path-date-slug) equality. Please make sure " \ + "that you change this tag to match the post's name exactly." + ) return relative_url(document) end diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb index 6505c04822f..a3f2a94d1dd 100644 --- a/lib/jekyll/theme.rb +++ b/lib/jekyll/theme.rb @@ -18,8 +18,8 @@ def root # Otherwise, Jekyll.sanitized path with prepend the unresolved root @root ||= File.realpath(gemspec.full_gem_path) rescue Errno::ENOENT, Errno::EACCES, Errno::ELOOP - raise "Path #{gemspec.full_gem_path} does not exist, is not accessible "\ - "or includes a symbolic link loop" + raise "Path #{gemspec.full_gem_path} does not exist, is not accessible or includes " \ + "a symbolic link loop" end # The name of theme directory diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb index 3c4a0091902..aeb2ac0d867 100644 --- a/lib/jekyll/url.rb +++ b/lib/jekyll/url.rb @@ -100,7 +100,7 @@ def generate_url_from_drop(template) winner = pool.find { |key| @placeholders.key?(key) } if winner.nil? raise NoMethodError, - "The URL template doesn't have #{pool.join(" or ")} keys. "\ + "The URL template doesn't have #{pool.join(" or ")} keys. " \ "Check your permalink template!" end diff --git a/lib/jekyll/utils/ansi.rb b/lib/jekyll/utils/ansi.rb index 35c5ffbc3b7..00d1b1db259 100644 --- a/lib/jekyll/utils/ansi.rb +++ b/lib/jekyll/utils/ansi.rb @@ -1,4 +1,4 @@ -# Frozen-string-literal: true +# frozen_string_literal: true module Jekyll module Utils diff --git a/test/helper.rb b/test/helper.rb index c40adcbad96..7b1a2b4b4f8 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -105,8 +105,7 @@ def mu_pp(obj) end def mocks_expect(*args) - RSpec::Mocks::ExampleMethods::ExpectHost.instance_method(:expect)\ - .bind(self).call(*args) + RSpec::Mocks::ExampleMethods::ExpectHost.instance_method(:expect).bind(self).call(*args) end def before_setup @@ -166,7 +165,7 @@ def clear_dest def directory_with_contents(path) FileUtils.rm_rf(path) FileUtils.mkdir(path) - File.open("#{path}/index.html", "w") { |f| f.write("I was previously generated.") } + File.write("#{path}/index.html", "I was previously generated.") end def with_env(key, value) diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb index 8e5005b8ff6..fe9d972cd4a 100644 --- a/test/test_commands_serve.rb +++ b/test/test_commands_serve.rb @@ -75,9 +75,7 @@ def serve(opts) HTML - File.open(File.join(@destination, "hello.html"), "w") do |f| - f.write(simple_page) - end + File.write(File.join(@destination, "hello.html"), simple_page) allow(Jekyll::Site).to receive(:new).and_return(site) end diff --git a/test/test_doctor_command.rb b/test/test_doctor_command.rb index 00984a82e5e..9a1e4173781 100644 --- a/test/test_doctor_command.rb +++ b/test/test_doctor_command.rb @@ -22,6 +22,7 @@ class TestDoctorCommand < JekyllUnitTest assert_equal "", output end + # rubocop:disable Layout/LineLength should "return warning for pages only differing by case" do @site = Site.new(Jekyll.configuration( "source" => File.join(source_dir, "/_urls_differ_by_case_invalid"), @@ -32,9 +33,10 @@ class TestDoctorCommand < JekyllUnitTest ret = Jekyll::Commands::Doctor.urls_only_differ_by_case(@site) assert ret end - assert_includes output, "Warning: The following URLs only differ by case. "\ - "On a case-insensitive file system one of the URLs will be overwritten by the "\ - "other: #{dest_dir}/about/index.html, #{dest_dir}/About/index.html" + assert_includes output, "Warning: The following URLs only differ by case. On a case-" \ + "insensitive file system one of the URLs will be overwritten by the " \ + "other: #{dest_dir}/about/index.html, #{dest_dir}/About/index.html" end + # rubocop:enable Layout/LineLength end end diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb index 195ac98e53f..5a4ce0a7573 100644 --- a/test/test_excerpt.rb +++ b/test/test_excerpt.rb @@ -111,8 +111,7 @@ def do_render(document) context "#content" do context "before render" do should "be the first paragraph of the page" do - expected = "First paragraph with [link ref][link].\n\n[link]: "\ - "https://jekyllrb.com/" + expected = "First paragraph with [link ref][link].\n\n[link]: https://jekyllrb.com/" assert_equal expected, @excerpt.content end @@ -129,7 +128,7 @@ def do_render(document) end should "be the first paragraph of the page" do - expected = "

First paragraph with link "\ + expected = "

First paragraph with link " \ "ref.

\n\n" assert_equal expected, @extracted_excerpt.output end @@ -146,7 +145,7 @@ def do_render(document) end should "contain all refs at the bottom of the page" do - (0..3).each do |i| + 4.times do |i| assert_match "[link_#{i}]: www.example.com/#{i}", @excerpt.content end end @@ -159,7 +158,7 @@ def do_render(document) @rendered_post = @post.dup do_render(@rendered_post) output = @rendered_post.data["excerpt"].output - (0..3).each do |i| + 4.times do |i| assert_includes output, "" end end diff --git a/test/test_page_without_a_file.rb b/test/test_page_without_a_file.rb index c6302e75b7a..e9202132638 100644 --- a/test/test_page_without_a_file.rb +++ b/test/test_page_without_a_file.rb @@ -164,8 +164,8 @@ def render_and_write refute_path_exists(dest_dir("virtual-about", "index.html")) end - should "be processed and written to destination when passed as "\ - "an entry in 'site.pages' array" do + should "be processed and written to destination when passed as an entry in " \ + "'site.pages' array" do @page.content = "{{ site.title }}" @page.data["permalink"] = "/virtual-about/" diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb index 1c78b6fa0b9..3a3b16b8c5b 100644 --- a/test/test_regenerator.rb +++ b/test/test_regenerator.rb @@ -174,9 +174,7 @@ class TestRegenerator < JekyllUnitTest metadata_file = source_dir(".jekyll-metadata") @regenerator = Regenerator.new(@site) - File.open(metadata_file, "w") do |f| - f.write(@regenerator.metadata.to_yaml) - end + File.write(metadata_file, @regenerator.metadata.to_yaml) @regenerator = Regenerator.new(@site) assert_equal File.mtime(@path), @regenerator.metadata[@path]["mtime"] diff --git a/test/test_site.rb b/test/test_site.rb index 56419a737c9..246f813ecd5 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -621,8 +621,8 @@ def convert(*_args) site = fixture_site("theme" => {}) assert_nil site.theme end - expected_msg = "Theme: value of 'theme' in config should be String " \ - "to use gem-based themes, but got Hash\n" + expected_msg = "Theme: value of 'theme' in config should be String to use " \ + "gem-based themes, but got Hash\n" assert_includes output, expected_msg end diff --git a/test/test_tags.rb b/test/test_tags.rb index 305baf0da2f..a82a6f2e174 100644 --- a/test/test_tags.rb +++ b/test/test_tags.rb @@ -450,10 +450,10 @@ def highlight_block_with_opts(options_string) end should "throw a deprecation warning" do - deprecation_warning = " Deprecation: A call to "\ - "'{% post_url 2008-11-21-nested %}' did not match a post using the new matching "\ - "method of checking name (path-date-slug) equality. Please make sure that you "\ - "change this tag to match the post's name exactly." + deprecation_warning = " Deprecation: A call to '{% post_url 2008-11-21-nested %}' " \ + "did not match a post using the new matching method of checking " \ + "name (path-date-slug) equality. Please make sure that you change " \ + "this tag to match the post's name exactly." assert_includes Jekyll.logger.messages, deprecation_warning end end @@ -693,7 +693,7 @@ def highlight_block_with_opts(options_string) context "include tag with parameters" do context "with symlink'd include" do should "not allow symlink includes" do - File.open("tmp/pages-test", "w") { |file| file.write("SYMLINK TEST") } + File.write("tmp/pages-test", "SYMLINK TEST") assert_raises IOError do content = <<~CONTENT --- @@ -1142,7 +1142,7 @@ def highlight_block_with_opts(options_string) context "with symlink'd include" do should "not allow symlink includes" do - File.open("tmp/pages-test", "w") { |file| file.write("SYMLINK TEST") } + File.write("tmp/pages-test", "SYMLINK TEST") assert_raises IOError do content = <<~CONTENT --- @@ -1181,7 +1181,7 @@ def highlight_block_with_opts(options_string) "safe" => true) end assert_match( - "Ensure it exists in one of those directories and is not a symlink "\ + "Ensure it exists in one of those directories and is not a symlink " \ "as those are not allowed in safe mode.", ex.message ) diff --git a/test/test_theme_assets_reader.rb b/test/test_theme_assets_reader.rb index 02ce004fad6..f45503e7dbb 100644 --- a/test/test_theme_assets_reader.rb +++ b/test/test_theme_assets_reader.rb @@ -14,15 +14,14 @@ def setup def assert_file_with_relative_path(haystack, relative_path) assert haystack.any? { |f| f.relative_path == relative_path - }, "Site should read in the #{relative_path} file, " \ - "but it was not found in #{haystack.inspect}" + }, "Site should read in the #{relative_path} file, but it was not found in #{haystack.inspect}" end def refute_file_with_relative_path(haystack, relative_path) refute haystack.any? { |f| f.relative_path == relative_path - }, "Site should not have read in the #{relative_path} file, " \ - "but it was found in #{haystack.inspect}" + }, "Site should not have read in the #{relative_path} file, but it was found in " \ + "#{haystack.inspect}" end context "with a valid theme" do @@ -82,7 +81,7 @@ def refute_file_with_relative_path(haystack, relative_path) begin tmp_dir = Dir.mktmpdir("jekyll-theme-test") - File.open(File.join(tmp_dir, "test.txt"), "wb") { |f| f.write "content" } + File.binwrite(File.join(tmp_dir, "test.txt"), "content") theme_dir = File.join(__dir__, "fixtures", "test-theme-symlink") File.symlink(tmp_dir, File.join(theme_dir, "assets")) From 7d9b6403c0d2182391d90bd57f1d02023d4b00f0 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 21 Sep 2022 10:25:51 -0700 Subject: [PATCH 091/290] Update history to reflect merge of #9125 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 4e08e4e7d88..088016fe166 100644 --- a/History.markdown +++ b/History.markdown @@ -112,6 +112,7 @@ * Bump actions/checkout from 2 to 3 (#8986) * Remove git.io shortlinks from repo (#9045) * Bump rubocop to 1.32 (#9093) + * Bump RuboCop to `1.36.x` (#9125) ### Minor Enhancements From d1e392f301450248ab3ebdceac70aed70b77f407 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 23 Sep 2022 13:27:21 -0400 Subject: [PATCH 092/290] Use check-spelling/check-spelling@v0.0.20 (#9111) Merge pull request 9111 --- .github/actions/spelling/allow.txt | 2 ++ .github/workflows/spelling.yml | 29 +++++++++++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt index e69de29bb2d..abb244b05e2 100644 --- a/.github/actions/spelling/allow.txt +++ b/.github/actions/spelling/allow.txt @@ -0,0 +1,2 @@ +statictastic +Statictastic diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index c6f39b7c209..91849de868a 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -12,11 +12,28 @@ on: - "*-stable" jobs: - build: + spelling: name: Spell Check - runs-on: "ubuntu-latest" + permissions: + contents: read + pull-requests: read + actions: read + outputs: + followup: ${{ steps.spelling.outputs.followup }} + runs-on: ubuntu-latest + if: "contains(github.event_name, 'pull_request') || github.event_name == 'push'" + concurrency: + group: spelling-${{ github.event.pull_request.number || github.ref }} + # note: If you use only_check_changed_files, you do not want cancel-in-progress + cancel-in-progress: true steps: - - name: Checkout Repository - uses: actions/checkout@v3 - - name: Check Spellings - uses: check-spelling/check-spelling@v0.0.19 + - name: check-spelling + id: spelling + uses: check-spelling/check-spelling@v0.0.20 + with: + # This workflow runs in response to both `push` and `pull_request`, if there's an open `pull_request` in the same repository for a given branch, there's no reason to spend resources checking both the `push` and the `pull_request`, so this flag tells the action while running for the `push` to find the `pull_request` and stop working early: + suppress_push_for_open_pull_request: 1 + # The action will manage checking out the repository itself instead of requiring the workflow to use `actions/checkout...`: + checkout: true + # If running without `: write`, posting a comment won't work, and for security `: write` permissions are left to a distinct (optional) job, here we skip trying to post a comment: + post_comment: 0 From 5b64b27b2c0908c3003bd2dfcce45a2861062ffc Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 23 Sep 2022 10:27:23 -0700 Subject: [PATCH 093/290] Update history to reflect merge of #9111 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 088016fe166..2e71682a8ab 100644 --- a/History.markdown +++ b/History.markdown @@ -113,6 +113,7 @@ * Remove git.io shortlinks from repo (#9045) * Bump rubocop to 1.32 (#9093) * Bump RuboCop to `1.36.x` (#9125) + * Use check-spelling/check-spelling@v0.0.20 (#9111) ### Minor Enhancements From b8cf7cf96d0199921d3b7e193f0c8613b1960186 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sat, 24 Sep 2022 19:24:56 +0530 Subject: [PATCH 094/290] Introduce `theme` drop to expose theme details (#9129) Merge pull request 9129 --- lib/jekyll/drops/theme_drop.rb | 36 ++++++++++++++++++++++++ lib/jekyll/drops/unified_payload_drop.rb | 4 +++ test/test_theme_drop.rb | 34 ++++++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 lib/jekyll/drops/theme_drop.rb create mode 100644 test/test_theme_drop.rb diff --git a/lib/jekyll/drops/theme_drop.rb b/lib/jekyll/drops/theme_drop.rb new file mode 100644 index 00000000000..a641fbea60e --- /dev/null +++ b/lib/jekyll/drops/theme_drop.rb @@ -0,0 +1,36 @@ +# frozen_string_literal: true + +module Jekyll + module Drops + class ThemeDrop < Drop + delegate_methods :root, :version + delegate_method_as :runtime_dependencies, :dependencies + + def authors + @authors ||= gemspec.authors.join(", ") + end + + def version + @version ||= gemspec.version.to_s + end + + def description + @description ||= gemspec.description || gemspec.summary + end + + def metadata + @metadata ||= gemspec.metadata + end + + private + + def gemspec + @gemspec ||= @obj.send(:gemspec) + end + + def fallback_data + @fallback_data ||= {} + end + end + end +end diff --git a/lib/jekyll/drops/unified_payload_drop.rb b/lib/jekyll/drops/unified_payload_drop.rb index 24e62e58c01..709ad712da0 100644 --- a/lib/jekyll/drops/unified_payload_drop.rb +++ b/lib/jekyll/drops/unified_payload_drop.rb @@ -16,6 +16,10 @@ def site @site_drop ||= SiteDrop.new(@obj) end + def theme + @theme_drop ||= ThemeDrop.new(@obj.theme) if @obj.theme + end + private def fallback_data diff --git a/test/test_theme_drop.rb b/test/test_theme_drop.rb new file mode 100644 index 00000000000..6ebbcf881e2 --- /dev/null +++ b/test/test_theme_drop.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +require "helper" + +class TestThemeDrop < JekyllUnitTest + should "be initialized only for gem-based themes" do + assert_nil fixture_site.to_liquid.theme + end + + context "a theme drop" do + setup do + @drop = fixture_site("theme" => "test-theme").to_liquid.theme + end + + should "respond to `key?`" do + assert_respond_to @drop, :key? + end + + should "export relevant data to Liquid templates" do + expected = { + "authors" => "Jekyll", + "dependencies" => [], + "description" => "This is a theme used to test Jekyll", + "metadata" => {}, + "root" => theme_dir, + "version" => "0.1.0", + } + expected.each_key do |key| + assert @drop.key?(key) + assert_equal expected[key], @drop[key] + end + end + end +end From 6633fd23356418d2402653caa3be24198841fa16 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sat, 24 Sep 2022 06:54:57 -0700 Subject: [PATCH 095/290] Update history to reflect merge of #9129 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 2e71682a8ab..15a5dad956e 100644 --- a/History.markdown +++ b/History.markdown @@ -129,6 +129,7 @@ * Expose collection static files via `site.static_files` (#8961) * Expose `basename` from `document.rb` as `name` to Liquid templates (#8761) * Allow Configurable Converters on CSV (#8858) + * Introduce `theme` drop to expose theme-gem details (#9129) ### Site Enhancements From d09c5105d7c99c92ba7a0a8078fc12734599eb88 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sun, 25 Sep 2022 20:23:04 +0530 Subject: [PATCH 096/290] Document keys of the `theme` drop Follow-up to #9129 --- docs/_data/jekyll_variables.yml | 18 ++++++++++++++++++ docs/_docs/variables.md | 4 ++++ lib/jekyll/drops/theme_drop.rb | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/docs/_data/jekyll_variables.yml b/docs/_data/jekyll_variables.yml index b3f493c8baf..7f41a15b115 100644 --- a/docs/_data/jekyll_variables.yml +++ b/docs/_data/jekyll_variables.yml @@ -16,6 +16,10 @@ global: description: >- Layout specific information + the front matter. Custom variables set via front matter in layouts will be available here. + - name: theme + description: >- + Theme-gem specific information as defined in the theme's gemspec. Useful for rendering + information in the theme demo's "About" page, for example. See below for details. - name: content description: >- In layout files, the rendered content of the Post or Page being wrapped. @@ -150,6 +154,20 @@ page: The previous post relative to the position of the current post in site.posts. Returns nil for the first entry. +theme: + - name: theme.root + description: Absolute path to the theme-gem. + - name: theme.authors + description: Comma separated string composed of the authors of the theme-gem. + - name: theme.description + description: Description or summary of the theme-gem as specified in the theme gemspec. + - name: theme.version + description: The version string of current theme. + - name: theme.dependencies + description: List of runtime dependencies of the theme. + - name: theme.metadata + description: A mapping of key-value pairs as defined in the theme gemspec. + paginator: - name: paginator.page description: The number of the current page diff --git a/docs/_docs/variables.md b/docs/_docs/variables.md index e42f9320998..f6d3b83af2b 100644 --- a/docs/_docs/variables.md +++ b/docs/_docs/variables.md @@ -34,6 +34,10 @@ The following is a reference of the available data.

+## Theme + +{% include docs_variables_table.html scope=site.data.jekyll_variables.theme %} + ## Paginator {% include docs_variables_table.html scope=site.data.jekyll_variables.paginator %} diff --git a/lib/jekyll/drops/theme_drop.rb b/lib/jekyll/drops/theme_drop.rb index a641fbea60e..b462532838c 100644 --- a/lib/jekyll/drops/theme_drop.rb +++ b/lib/jekyll/drops/theme_drop.rb @@ -3,7 +3,7 @@ module Jekyll module Drops class ThemeDrop < Drop - delegate_methods :root, :version + delegate_methods :root delegate_method_as :runtime_dependencies, :dependencies def authors From b632afd2db11a7cc1c5c9328cc334b06558dafcb Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sun, 25 Sep 2022 20:42:58 +0530 Subject: [PATCH 097/290] Add version badge to documentation header --- docs/_docs/variables.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/_docs/variables.md b/docs/_docs/variables.md index f6d3b83af2b..0bf93737145 100644 --- a/docs/_docs/variables.md +++ b/docs/_docs/variables.md @@ -34,7 +34,8 @@ The following is a reference of the available data.

-## Theme +## Theme Variables {%- include docs_version_badge.html version="4.3.0" -%} +{: #theme-variables } {% include docs_variables_table.html scope=site.data.jekyll_variables.theme %} From 1a3d85a8a550bcdbc6239e4f7d575dd1eab13c50 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Wed, 28 Sep 2022 16:24:46 +0530 Subject: [PATCH 098/290] Relax version constraint to allow Rouge 4.x (#9134) Merge pull request 9134 --- jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll.gemspec b/jekyll.gemspec index ea56adc31d0..32560921673 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -48,7 +48,7 @@ Gem::Specification.new do |s| # TODO: Remove lock once we implement a way to use Psych 4 without breaking anything. s.add_runtime_dependency("psych", "~> 3.3") - s.add_runtime_dependency("rouge", "~> 3.0") + s.add_runtime_dependency("rouge", ">= 3.0", "< 5.0") s.add_runtime_dependency("safe_yaml", "~> 1.0") s.add_runtime_dependency("terminal-table", ">= 1.8", "< 4.0") s.add_runtime_dependency("webrick", "~> 1.7") From 1baded9acd089bd116ac42e8d622d91bc3f3d26d Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 28 Sep 2022 03:54:48 -0700 Subject: [PATCH 099/290] Update history to reflect merge of #9134 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 15a5dad956e..2a45a3bb67f 100644 --- a/History.markdown +++ b/History.markdown @@ -130,6 +130,7 @@ * Expose `basename` from `document.rb` as `name` to Liquid templates (#8761) * Allow Configurable Converters on CSV (#8858) * Introduce `theme` drop to expose theme-gem details (#9129) + * Relax version constraint to allow Rouge 4.x (#9134) ### Site Enhancements From 7a70a3ae5e5b8822267337df0073c1efc834cd26 Mon Sep 17 00:00:00 2001 From: Youssef Boulkaid Date: Thu, 29 Sep 2022 09:16:32 +0200 Subject: [PATCH 100/290] Unlock Psych dependency (#9135) Merge pull request 9135 --- features/step_definitions.rb | 2 +- jekyll.gemspec | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/features/step_definitions.rb b/features/step_definitions.rb index 9d479ecf69c..616ab0b6656 100644 --- a/features/step_definitions.rb +++ b/features/step_definitions.rb @@ -163,7 +163,7 @@ else {} end - config[key] = YAML.load(value) + config[key] = SafeYAML.load(value) Jekyll.set_timezone(value) if key == "timezone" File.write("_config.yml", YAML.dump(config)) end diff --git a/jekyll.gemspec b/jekyll.gemspec index 32560921673..3bdd3e3b616 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -43,11 +43,6 @@ Gem::Specification.new do |s| s.add_runtime_dependency("liquid", "~> 4.0") s.add_runtime_dependency("mercenary", ">= 0.3.6", "< 0.5") s.add_runtime_dependency("pathutil", "~> 0.9") - - # Ruby 3.1.0 shipped with `psych-4.0.3` which caused some of our Cucumber-based tests to fail. - # TODO: Remove lock once we implement a way to use Psych 4 without breaking anything. - s.add_runtime_dependency("psych", "~> 3.3") - s.add_runtime_dependency("rouge", ">= 3.0", "< 5.0") s.add_runtime_dependency("safe_yaml", "~> 1.0") s.add_runtime_dependency("terminal-table", ">= 1.8", "< 4.0") From e05a25a66839a80fe084443b06634769fdc21be6 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 29 Sep 2022 00:16:34 -0700 Subject: [PATCH 101/290] Update history to reflect merge of #9135 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 2a45a3bb67f..cd15f820e77 100644 --- a/History.markdown +++ b/History.markdown @@ -88,6 +88,7 @@ * Only enable BOM encoding option on UTF encodings (#8363) * Ensure theme config is a `Jekyll::Configuration` object (#8988) * Remove misleading totals row from `--profile` table (#9039) + * Unlock Psych dependency (#9135) ### Development Fixes From daca7e53a1446436888f1d60b0acb304b46a0c3b Mon Sep 17 00:00:00 2001 From: Youssef Boulkaid Date: Thu, 29 Sep 2022 12:37:42 +0200 Subject: [PATCH 102/290] Disable pending cops when running rubocop (#9136) Merge pull request 9136 --- script/fmt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/fmt b/script/fmt index b7514213a1e..9a6cd0884cb 100755 --- a/script/fmt +++ b/script/fmt @@ -1,6 +1,6 @@ #!/bin/bash echo "RuboCop $(bundle exec rubocop --version)" -bundle exec rubocop -D $@ +bundle exec rubocop -D --disable-pending-cops $@ success=$? if ((success != 0)); then echo -e "\nTry running \`script/fmt -a\` to automatically fix errors" From d45fb9647761c8c208865f71cedb9f2f0dc26f1d Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 29 Sep 2022 03:37:44 -0700 Subject: [PATCH 103/290] Update history to reflect merge of #9136 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index cd15f820e77..8b974b3171e 100644 --- a/History.markdown +++ b/History.markdown @@ -115,6 +115,7 @@ * Bump rubocop to 1.32 (#9093) * Bump RuboCop to `1.36.x` (#9125) * Use check-spelling/check-spelling@v0.0.20 (#9111) + * Disable pending cops when running rubocop (#9136) ### Minor Enhancements From 160a6816af841a13479432a6bc94407996d4c239 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 29 Sep 2022 18:16:24 +0530 Subject: [PATCH 104/290] Incrementally rebuild when a data file is changed (#8771) Merge pull request 8771 --- features/incremental_rebuild.feature | 53 ++++++++++++++++++ lib/jekyll.rb | 2 + lib/jekyll/data_entry.rb | 83 ++++++++++++++++++++++++++++ lib/jekyll/data_hash.rb | 61 ++++++++++++++++++++ lib/jekyll/drops/site_drop.rb | 7 ++- lib/jekyll/readers/data_reader.rb | 9 ++- lib/jekyll/utils.rb | 9 ++- test/source/_data/boolean.yml | 1 + test/source/_data/languages_plus.yml | 4 ++ test/test_data_entry.rb | 34 ++++++++++++ test/test_data_hash.rb | 57 +++++++++++++++++++ 11 files changed, 315 insertions(+), 5 deletions(-) create mode 100644 lib/jekyll/data_entry.rb create mode 100644 lib/jekyll/data_hash.rb create mode 100644 test/source/_data/boolean.yml create mode 100644 test/source/_data/languages_plus.yml create mode 100644 test/test_data_entry.rb create mode 100644 test/test_data_hash.rb diff --git a/features/incremental_rebuild.feature b/features/incremental_rebuild.feature index 2d22d2e1940..8eacaf23171 100644 --- a/features/incremental_rebuild.feature +++ b/features/incremental_rebuild.feature @@ -67,6 +67,59 @@ Feature: Incremental rebuild And the _site directory should exist And I should see "Basic Site with include tag: Regenerated by Jekyll" in "_site/index.html" + Scenario: Rebuild when a data file is changed + Given I have a _data directory + And I have a "_data/colors.yml" file that contains "[red, green, blue]" + And I have a _data/members/core directory + And I have a "_data/members/core/emeritus.yml" file with content: + """ + - name: John Doe + role: Admin + """ + And I have an _includes directory + And I have an "_includes/about.html" file with content: + """ +
    + {% for entry in site.data.members.core.emeritus %} +
  • {{ entry.name }}
    • + {% endfor %} +
+ """ + And I have a _layouts directory + And I have a page layout that contains "{{ content }}\n\n{% include about.html %}" + And I have a home layout that contains "{{ content }}\n\nGenerated by Jekyll" + And I have a "_layouts/post.html" page with layout "page" that contains "{{ content }}" + And I have a "_layouts/static.html" page with layout "home" that contains "{{ content }}" + And I have an "index.html" page with layout "home" that contains "{{ site.data.colors | join: '_' }}" + And I have an "about.html" page with layout "page" that contains "About Us" + And I have a configuration file with "collections_dir" set to "collections" + And I have a collections/_posts directory + And I have the following post within the "collections" directory: + | title | date | layout | content | + | Table | 2009-03-26 | post | Post with data dependency | + | Wargames | 2009-03-27 | static | Post without data dependency | + When I run jekyll build -IV + Then I should get a zero exit status + And the _site directory should exist + And I should see "red_green_blue" in "_site/index.html" + And I should see "John Doe -- Admin" in "_site/about.html" + And I should see "Rendering: index.html" in the build output + And I should see "Rendering: _posts/2009-03-27-wargames.markdown" in the build output + When I wait 1 second + Then I have a "_data/members/core/emeritus.yml" file with content: + """ + - name: Jane Doe + role: Admin + """ + When I run jekyll build -IV + Then I should get a zero exit status + And the _site directory should exist + And I should see "red_green_blue" in "_site/index.html" + And I should see "Jane Doe -- Admin" in "_site/about.html" + And I should see "Rendering: _posts/2009-03-26-table.markdown" in the build output + But I should not see "Rendering: index.html" in the build output + And I should not see "Rendering: _posts/2009-03-27-wargames.markdown" in the build output + Scenario: Rebuild when a dependency of document in custom collection_dir is changed Given I have a _includes directory And I have a configuration file with "collections_dir" set to "collections" diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 231f8fd89c9..49b71e70d0f 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -45,6 +45,8 @@ module Jekyll autoload :Collection, "jekyll/collection" autoload :Configuration, "jekyll/configuration" autoload :Convertible, "jekyll/convertible" + autoload :DataEntry, "jekyll/data_entry" + autoload :DataHash, "jekyll/data_hash" autoload :Deprecator, "jekyll/deprecator" autoload :Document, "jekyll/document" autoload :EntryFilter, "jekyll/entry_filter" diff --git a/lib/jekyll/data_entry.rb b/lib/jekyll/data_entry.rb new file mode 100644 index 00000000000..fa26722174f --- /dev/null +++ b/lib/jekyll/data_entry.rb @@ -0,0 +1,83 @@ +# frozen_string_literal: true + +module Jekyll + class DataEntry + attr_accessor :context + attr_reader :data + + # Create a Jekyll wrapper for given parsed data object. + # + # site - The current Jekyll::Site instance. + # abs_path - Absolute path to the data source file. + # parsed_data - Parsed representation of data source file contents. + # + # Returns nothing. + def initialize(site, abs_path, parsed_data) + @site = site + @path = abs_path + @data = parsed_data + end + + # Liquid representation of current instance is the parsed data object. + # + # Mark as a dependency for regeneration here since every renderable object primarily uses the + # parsed data object while the parent resource is being rendered by Liquid. Accessing the data + # object directly via Ruby interface `#[]()` is outside the scope of regeneration. + # + # FIXME: Marking as dependency on every call is non-ideal. Optimize at later day. + # + # Returns the parsed data object. + def to_liquid + add_regenerator_dependencies if incremental_build? + @data + end + + # -- Overrides to maintain backwards compatibility -- + + # Any missing method will be forwarded to the underlying data object stored in the instance + # variable `@data`. + def method_missing(method, *args, &block) + @data.respond_to?(method) ? @data.send(method, *args, &block) : super + end + + def respond_to_missing?(method, *) + @data.respond_to?(method) || super + end + + def <=>(other) + data <=> (other.is_a?(self.class) ? other.data : other) + end + + def ==(other) + data == (other.is_a?(self.class) ? other.data : other) + end + + # Explicitly defined to bypass re-routing from `method_missing` hook for greater performance. + # + # Returns string representation of parsed data object. + def inspect + @data.inspect + end + + private + + def incremental_build? + @incremental = @site.config["incremental"] if @incremental.nil? + @incremental + end + + def add_regenerator_dependencies + page = context.registers[:page] + return unless page&.key?("path") + + absolute_path = \ + if page["collection"] + @site.in_source_dir(@site.config["collections_dir"], page["path"]) + else + @site.in_source_dir(page["path"]) + end + + @site.regenerator.add_dependency(absolute_path, @path) + end + end +end diff --git a/lib/jekyll/data_hash.rb b/lib/jekyll/data_hash.rb new file mode 100644 index 00000000000..37ef510b681 --- /dev/null +++ b/lib/jekyll/data_hash.rb @@ -0,0 +1,61 @@ +# frozen_string_literal: true + +module Jekyll + # A class that behaves very similar to Ruby's `Hash` class yet different in how it is handled by + # Liquid. This class emulates Hash by delegation instead of inheritance to minimize overridden + # methods especially since some Hash methods returns another Hash instance instead of the + # subclass instance. + class DataHash + # + # Delegate given (zero-arity) method(s) to the Hash object stored in instance variable + # `@registry`. + # NOTE: Avoiding the use of `Forwardable` module's `def_delegators` for preventing unnecessary + # creation of interim objects on multiple calls. + def self.delegate_to_registry(*symbols) + symbols.each { |sym| define_method(sym) { @registry.send(sym) } } + end + private_class_method :delegate_to_registry + + # -- core instance methods -- + + attr_accessor :context + + def initialize + @registry = {} + end + + def [](key) + @registry[key].tap do |value| + value.context = context if value.respond_to?(:context=) + end + end + + # `Hash#to_liquid` returns the Hash instance itself. + # Mimic that behavior by returning `self` instead of returning the `@registry` variable value. + def to_liquid + self + end + + # -- supplementary instance methods to emulate Hash -- + + delegate_to_registry :freeze, :inspect + + def merge(other, &block) + merged_registry = @registry.merge(other, &block) + dup.tap { |d| d.instance_variable_set(:@registry, merged_registry) } + end + + def merge!(other, &block) + @registry.merge!(other, &block) + self + end + + def method_missing(method, *args, &block) + @registry.send(method, *args, &block) + end + + def respond_to_missing?(method, *) + @registry.respond_to?(method) + end + end +end diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb index cc3c60fb619..13c5757b445 100644 --- a/lib/jekyll/drops/site_drop.rb +++ b/lib/jekyll/drops/site_drop.rb @@ -7,7 +7,6 @@ class SiteDrop < Drop mutable false - delegate_method_as :site_data, :data delegate_methods :time, :pages, :static_files, :tags, :categories private delegate_method_as :config, :fallback_data @@ -24,6 +23,12 @@ def key?(key) (key != "posts" && @obj.collections.key?(key)) || super end + def data + @obj.site_data.tap do |value| + value.context = @context if value.respond_to?(:context=) + end + end + def posts @site_posts ||= @obj.posts.docs.sort { |a, b| b <=> a } end diff --git a/lib/jekyll/readers/data_reader.rb b/lib/jekyll/readers/data_reader.rb index 80b57bd6bd7..f95556da7a7 100644 --- a/lib/jekyll/readers/data_reader.rb +++ b/lib/jekyll/readers/data_reader.rb @@ -6,7 +6,7 @@ class DataReader def initialize(site, in_source_dir: nil) @site = site - @content = {} + @content = DataHash.new @entry_filter = EntryFilter.new(site) @in_source_dir = in_source_dir || @site.method(:in_source_dir) @source_dir = @in_source_dir.call("/") @@ -24,6 +24,8 @@ def read(dir) @content end + # rubocop:disable Metrics/AbcSize + # Read and parse all .yaml, .yml, .json, .csv and .tsv # files under and add them to the variable. # @@ -43,13 +45,14 @@ def read_data_to(dir, data) next if @entry_filter.symlink?(path) if File.directory?(path) - read_data_to(path, data[sanitize_filename(entry)] = {}) + read_data_to(path, data[sanitize_filename(entry)] = DataHash.new) else key = sanitize_filename(File.basename(entry, ".*")) - data[key] = read_data_file(path) + data[key] = DataEntry.new(site, path, read_data_file(path)) end end end + # rubocop:enable Metrics/AbcSize # Determines how to read a data file. # diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index 2a965270481..8eb807d71cc 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -47,7 +47,14 @@ def deep_merge_hashes!(target, overwrite) end def mergable?(value) - value.is_a?(Hash) || value.is_a?(Drops::Drop) + case value + when Hash, Drops::Drop, DataHash + true + when DataEntry + mergable?(value.data) + else + false + end end def duplicable?(obj) diff --git a/test/source/_data/boolean.yml b/test/source/_data/boolean.yml new file mode 100644 index 00000000000..fe75c80bca5 --- /dev/null +++ b/test/source/_data/boolean.yml @@ -0,0 +1 @@ +true diff --git a/test/source/_data/languages_plus.yml b/test/source/_data/languages_plus.yml new file mode 100644 index 00000000000..fb98401bd3f --- /dev/null +++ b/test/source/_data/languages_plus.yml @@ -0,0 +1,4 @@ +- java +- ruby +- rust +- golang diff --git a/test/test_data_entry.rb b/test/test_data_entry.rb new file mode 100644 index 00000000000..dc6e8e93b10 --- /dev/null +++ b/test/test_data_entry.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +require "helper" + +class TestDataEntry < JekyllUnitTest + context "Data Entry" do + setup do + site = fixture_site + site.read + @data_hash = site.site_data + end + + should "expose underlying data object es Liquid representation" do + subject = @data_hash["languages"] + assert_equal Jekyll::DataEntry, subject.class + assert_equal subject.data, subject.to_liquid + end + + should "respond to `#[](key)` when expected to but raise Exception otherwise" do + greeting = @data_hash["greetings"] + assert greeting["foo"] + + boolean = @data_hash["boolean"] # the value is a Boolean. + assert_raises(NoMethodError) { boolean["foo"] } + end + + should "compare with another instance of same class using underlying data" do + assert_equal( + [%w(java ruby), %w(java ruby rust golang)], + [@data_hash["languages_plus"], @data_hash["languages"]].sort + ) + end + end +end diff --git a/test/test_data_hash.rb b/test/test_data_hash.rb new file mode 100644 index 00000000000..022c2543312 --- /dev/null +++ b/test/test_data_hash.rb @@ -0,0 +1,57 @@ +# frozen_string_literal: true + +require "helper" + +class TestDataHash < JekyllUnitTest + context "Data Hash" do + setup do + @site = fixture_site + @site.read + end + + should "only mimic a ::Hash instance" do + subject = @site.site_data + assert_equal Jekyll::DataHash, subject.class + refute subject.is_a?(Hash) + + copy = subject.dup + assert copy["greetings"]["foo"] + assert_includes copy.dig("greetings", "foo"), "Hello!" + + copy["greetings"] = "Hola!" + assert_equal "Hola!", copy["greetings"] + refute copy["greetings"]["foo"] + + frozen_data_hash = Jekyll::DataHash.new.freeze + assert_raises(FrozenError) { frozen_data_hash["lorem"] = "ipsum" } + end + + should "be mergable" do + alpha = Jekyll::DataHash.new + beta = Jekyll::DataHash.new + + assert_equal "{}", alpha.inspect + sample_data = { "foo" => "bar" } + + assert_equal sample_data["foo"], alpha.merge(sample_data)["foo"] + assert_equal alpha.class, alpha.merge(sample_data).class + assert_empty alpha + + beta.merge!(sample_data) + assert_equal sample_data["foo"], alpha.merge(beta)["foo"] + assert_equal alpha.class, alpha.merge(beta).class + assert_empty alpha + + beta.merge!(@site.site_data) + assert_equal alpha.class, beta.class + assert_includes beta.dig("greetings", "foo"), "Hello!" + + assert_empty alpha + assert_equal sample_data["foo"], Jekyll::Utils.deep_merge_hashes(alpha, sample_data)["foo"] + assert_includes( + Jekyll::Utils.deep_merge_hashes(alpha, beta).dig("greetings", "foo"), + "Hello!" + ) + end + end +end From 2cc51e6abab049621f49e3375a138c296a0494d5 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 29 Sep 2022 05:46:26 -0700 Subject: [PATCH 105/290] Update history to reflect merge of #8771 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 8b974b3171e..32c96c75801 100644 --- a/History.markdown +++ b/History.markdown @@ -133,6 +133,7 @@ * Allow Configurable Converters on CSV (#8858) * Introduce `theme` drop to expose theme-gem details (#9129) * Relax version constraint to allow Rouge 4.x (#9134) + * Incrementally rebuild when a data file is changed (#8771) ### Site Enhancements From 823c8f94d212d2614e4f2245e8e25e4ee540214e Mon Sep 17 00:00:00 2001 From: Youssef Boulkaid Date: Sun, 2 Oct 2022 12:16:53 +0200 Subject: [PATCH 106/290] Relax RDoc version dependency (#9142) Merge pull request 9142 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 66575a7eef0..12d04d4a39f 100644 --- a/Gemfile +++ b/Gemfile @@ -75,7 +75,7 @@ group :jekyll_optional_dependencies do gem "kramdown-syntax-coderay" gem "matrix" gem "mime-types", "~> 3.0" - gem "rdoc", "~> 6.3.0" + gem "rdoc", "~> 6.0" gem "tomlrb" platforms :ruby, :mswin, :mingw, :x64_mingw do From fe45439b6c95bcf575af455a83d00c71c1fff54d Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 2 Oct 2022 03:16:54 -0700 Subject: [PATCH 107/290] Update history to reflect merge of #9142 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 32c96c75801..def3a3804c8 100644 --- a/History.markdown +++ b/History.markdown @@ -116,6 +116,7 @@ * Bump RuboCop to `1.36.x` (#9125) * Use check-spelling/check-spelling@v0.0.20 (#9111) * Disable pending cops when running rubocop (#9136) + * Relax RDoc version dependency (#9142) ### Minor Enhancements From 5d5d975672119ba069617d82efca809cee8d7ca4 Mon Sep 17 00:00:00 2001 From: Kaben Date: Fri, 7 Oct 2022 15:04:40 +0900 Subject: [PATCH 108/290] Update posts.md (#9151) Merge pull request 9151 --- docs/_docs/posts.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_docs/posts.md b/docs/_docs/posts.md index b42524929ea..9ff230ad54c 100644 --- a/docs/_docs/posts.md +++ b/docs/_docs/posts.md @@ -168,7 +168,7 @@ Categories of a post work similar to the tags above: *The similarity between categories and tags however, ends there.* Unlike tags, categories for posts can also be defined by a post's file path. -Any directory above `_post` will be read-in as a category. For example, +Any directory above `_posts` will be read-in as a category. For example, if a post is at path `movies/horror/_posts/2019-05-21-bride-of-chucky.markdown`, then `movies` and `horror` are automatically registered as categories for that post. From bb851e235dfbe1f197388aea3e7f0eeb1b50c4e3 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 6 Oct 2022 23:04:42 -0700 Subject: [PATCH 109/290] Update history to reflect merge of #9151 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index def3a3804c8..d510fcace76 100644 --- a/History.markdown +++ b/History.markdown @@ -70,6 +70,7 @@ * Windows: describe which option to choose (#9049) * Improve links (http -> https) (#9064) * Update ruby version for macos guide (#9086) + * Update posts.md (#9151) ### Bug Fixes From 6903f0b0f47c53513f59f9a005cc3c159b26c1e9 Mon Sep 17 00:00:00 2001 From: Youssef Boulkaid Date: Sun, 16 Oct 2022 13:48:24 +0200 Subject: [PATCH 110/290] Fix false positive conflicts for static files in a collection (#9141) Merge pull request 9141 --- lib/jekyll/site.rb | 4 ++++ test/test_site.rb | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index 2fad097be3e..d6c5a0b88e6 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -360,9 +360,13 @@ def documents end def each_site_file + seen_files = [] %w(pages static_files_to_write docs_to_write).each do |type| send(type).each do |item| + next if seen_files.include?(item) + yield item + seen_files << item end end end diff --git a/test/test_site.rb b/test/test_site.rb index 246f813ecd5..7556174d0f3 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -749,5 +749,14 @@ def convert(*_args) assert_includes site.static_files.map(&:relative_path), "_methods/extensionless_static_file" end + + should "not be revisited in `Site#each_site_file`" do + site = fixture_site("collections" => { "methods" => { "output" => true } }) + site.read + + visited_files = [] + site.each_site_file { |file| visited_files << file } + assert_equal visited_files.count, visited_files.uniq.count + end end end From 3554b73b7fcbafc21afe0e1771b0635d50d5f365 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 16 Oct 2022 04:48:26 -0700 Subject: [PATCH 111/290] Update history to reflect merge of #9141 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index d510fcace76..bccd79cdcda 100644 --- a/History.markdown +++ b/History.markdown @@ -90,6 +90,7 @@ * Ensure theme config is a `Jekyll::Configuration` object (#8988) * Remove misleading totals row from `--profile` table (#9039) * Unlock Psych dependency (#9135) + * Fix false positive conflicts for static files in a collection (#9141) ### Development Fixes From 03f7ddc80120a5ee91c3623cf337ab82b5cf8d47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= Date: Sun, 16 Oct 2022 07:37:05 -0700 Subject: [PATCH 112/290] Support jekyll-sass-converter 3.x (#9132) Merge pull request 9132 --- jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll.gemspec b/jekyll.gemspec index 3bdd3e3b616..67333b2b10f 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency("colorator", "~> 1.0") s.add_runtime_dependency("em-websocket", "~> 0.5") s.add_runtime_dependency("i18n", "~> 1.0") - s.add_runtime_dependency("jekyll-sass-converter", "~> 2.0") + s.add_runtime_dependency("jekyll-sass-converter", ">= 2.0", "< 4.0") s.add_runtime_dependency("jekyll-watch", "~> 2.0") s.add_runtime_dependency("kramdown", "~> 2.3", ">= 2.3.1") s.add_runtime_dependency("kramdown-parser-gfm", "~> 1.0") From 35e08eb9dbe5dcbd2f62871ce607f664ab31755c Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 16 Oct 2022 07:37:06 -0700 Subject: [PATCH 113/290] Update history to reflect merge of #9132 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index bccd79cdcda..cc065790ae3 100644 --- a/History.markdown +++ b/History.markdown @@ -137,6 +137,7 @@ * Introduce `theme` drop to expose theme-gem details (#9129) * Relax version constraint to allow Rouge 4.x (#9134) * Incrementally rebuild when a data file is changed (#8771) + * Support jekyll-sass-converter 3.x (#9132) ### Site Enhancements From 6d3dc74c7d70944e97397b8056f691df81eb41e3 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 20 Oct 2022 14:47:52 +0530 Subject: [PATCH 114/290] Bump RuboCop to `v1.37.x` --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 12d04d4a39f..e6ad84f3466 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ group :test do gem "nokogiri", "~> 1.7" gem "rspec" gem "rspec-mocks" - gem "rubocop", "~> 1.36.0" + gem "rubocop", "~> 1.37.0" gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rake" From f030e55f706358ca45e121244d412c347265866b Mon Sep 17 00:00:00 2001 From: Kaben Date: Thu, 20 Oct 2022 19:15:40 +0900 Subject: [PATCH 115/290] Fix URL to Liquid documentation (#9158) --- docs/_docs/posts.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_docs/posts.md b/docs/_docs/posts.md index 9ff230ad54c..7167f672e3d 100644 --- a/docs/_docs/posts.md +++ b/docs/_docs/posts.md @@ -96,7 +96,7 @@ Linking to a PDF for readers to download: ## Displaying an index of posts Creating an index of posts on another page should be easy thanks to -[Liquid](https://docs.shopify.com/themes/liquid/basics) and its tags. Here’s a +[Liquid](https://shopify.github.io/liquid/) and its tags. Here’s a simple example of how to create a list of links to your blog posts: {% raw %} From 520326406c46f11c209db451deedb92a1c7eebe0 Mon Sep 17 00:00:00 2001 From: Giuseppe Bertone Date: Thu, 20 Oct 2022 12:22:08 +0200 Subject: [PATCH 116/290] Document xz dependency on macOS (#9098) Signed-off-by: Giuseppe Bertone --- docs/_docs/installation/macos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md index 259c7dcd166..d4452772a51 100644 --- a/docs/_docs/installation/macos.md +++ b/docs/_docs/installation/macos.md @@ -48,7 +48,7 @@ Jekyll on your Mac, or if you run into any issues, read that guide. Install `chruby` and `ruby-install` with Homebrew: ```sh -brew install chruby ruby-install +brew install chruby ruby-install xz ``` Install the latest stable version of Ruby: From e27605e380a3ca431d0723a0914c709bb8175bba Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 20 Oct 2022 18:58:29 +0530 Subject: [PATCH 117/290] Clean up HEAD section in History document --- History.markdown | 133 +++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 67 deletions(-) diff --git a/History.markdown b/History.markdown index cc065790ae3..0b5bc03ad67 100644 --- a/History.markdown +++ b/History.markdown @@ -1,6 +1,72 @@ ## HEAD +### Minor Enhancements + + * Add webrick as a dependency (#8524) + * Regenerate supported mime types (#8542) + * Update include tag to be more permissive (#8618) + * Optimize `Jekyll::Utils.parse_date` (#8425) + * Update rubocop from 1.12 to 1.18 and min ruby from 2.4 to 2.5 (#8741) + * Always hide cache-dir contents from Git (#8798) + * Remove the warning about auto-regeneration on Windows (#8821) + * Propagate _data folder from theme (#8815) + * Support both tzinfo v1 and v2 alongwith non-half hour offsets. (#8880) + * Run vendor-mimes to update mime.types (#8940) + * Expose collection static files via `site.static_files` (#8961) + * Expose `basename` from `document.rb` as `name` to Liquid templates (#8761) + * Allow Configurable Converters on CSV (#8858) + * Introduce `theme` drop to expose theme-gem details (#9129) + * Relax version constraint to allow Rouge 4.x (#9134) + * Incrementally rebuild when a data file is changed (#8771) + * Support jekyll-sass-converter 3.x (#9132) + +### Bug Fixes + + * fix: pin rubocop to 1.12 due to error with ruby 2.4 (#8651) + * Load Jekyll plugins from BUNDLE_GEMFILE location (#8585) + * fix(security): CVE-2021-28834 (#8680) + * Inject livereload script using `location.protocol` instead of `http:` (#8718) + * Respect collections_dir config within include tag (#8756) + * Fix regression in Convertible module from v4.2.0 (#8786) + * Revert #7253: "Don't reset site.url to localhost:4000 by default" (#8620) + * Improve readability of CI logs (#8877) + * Fix deprecation message for missing doc method (#8960) + * Fix response header for content served via `jekyll serve` (#8965) + * Trigger livereload in sites without pages (#8337) + * Only enable BOM encoding option on UTF encodings (#8363) + * Ensure theme config is a `Jekyll::Configuration` object (#8988) + * Remove misleading totals row from `--profile` table (#9039) + * Unlock Psych dependency (#9135) + * Fix false positive conflicts for static files in a collection (#9141) + +### Development Fixes + + * style: enable new cops (#8538) + * Allow dependabot to keep github actions up-to-date (#8540) + * Update actions/cache requirement to v2.1.3 (#8543) + * Pin rubocop version (#8564) + * style: add rubocop 1.9 cops (#8567) + * Cross Version Testing Locally and Faster CI (#8610) + * Use official Ruby setup GH action (#8614) + * Spell check action for markdown documentation (#8675) + * Update expect to cover docs/_posts (#8677) * Bump check-spelling/check-spelling from 0.0.18 to 0.0.19 (#8740) + * Enable Rubocop accessor grouping, fix existing offenses (#8293) + * Tags:Highlight: Decomposed HTMLLegacy formatter (#8623) + * Relax Rubocop Dependency (#8831) + * Add a workflow to build gems consistently (#8830) + * Fix random test failures in TestExcerpt #to_liquid (#8884) + * Lock gem `psych` to `v3.x` (#8918) + * Fix typo in Bug Report template (#8951) + * Check symlink outside site_source without Pathutil (#9015) + * Stop testing with Rubies older than 2.7 on non-Windows (#8955) + * Bump actions/checkout from 2 to 3 (#8986) + * Remove git.io shortlinks from repo (#9045) + * Bump rubocop to 1.32 (#9093) + * Bump RuboCop to `1.36.x` (#9125) + * Use check-spelling/check-spelling@v0.0.20 (#9111) + * Disable pending cops when running rubocop (#9136) + * Relax RDoc version dependency (#9142) ### Documentation @@ -72,73 +138,6 @@ * Update ruby version for macos guide (#9086) * Update posts.md (#9151) -### Bug Fixes - - * Add webrick as a dependency (#8524) - * fix: pin rubocop to 1.12 due to error with ruby 2.4 (#8651) - * Load Jekyll plugins from BUNDLE_GEMFILE location (#8585) - * fix(security): CVE-2021-28834 (#8680) - * Inject livereload script using `location.protocol` instead of `http:` (#8718) - * Respect collections_dir config within include tag (#8756) - * Fix regression in Convertible module from v4.2.0 (#8786) - * Revert #7253: "Don't reset site.url to localhost:4000 by default" (#8620) - * Improve readability of CI logs (#8877) - * Fix deprecation message for missing doc method (#8960) - * Fix response header for content served via `jekyll serve` (#8965) - * Trigger livereload in sites without pages (#8337) - * Only enable BOM encoding option on UTF encodings (#8363) - * Ensure theme config is a `Jekyll::Configuration` object (#8988) - * Remove misleading totals row from `--profile` table (#9039) - * Unlock Psych dependency (#9135) - * Fix false positive conflicts for static files in a collection (#9141) - -### Development Fixes - - * style: enable new cops (#8538) - * Allow dependabot to keep github actions up-to-date (#8540) - * Update actions/cache requirement to v2.1.3 (#8543) - * Pin rubocop version (#8564) - * style: add rubocop 1.9 cops (#8567) - * Cross Version Testing Locally and Faster CI (#8610) - * Use official Ruby setup GH action (#8614) - * Spell check action for markdown documentation (#8675) - * Update expect to cover docs/_posts (#8677) - * Enable Rubocop accessor grouping, fix existing offenses (#8293) - * Tags:Highlight: Decomposed HTMLLegacy formatter (#8623) - * Relax Rubocop Dependency (#8831) - * Add a workflow to build gems consistently (#8830) - * Fix random test failures in TestExcerpt #to_liquid (#8884) - * Lock gem `psych` to `v3.x` (#8918) - * Fix typo in Bug Report template (#8951) - * Check symlink outside site_source without Pathutil (#9015) - * Stop testing with Rubies older than 2.7 on non-Windows (#8955) - * Bump actions/checkout from 2 to 3 (#8986) - * Remove git.io shortlinks from repo (#9045) - * Bump rubocop to 1.32 (#9093) - * Bump RuboCop to `1.36.x` (#9125) - * Use check-spelling/check-spelling@v0.0.20 (#9111) - * Disable pending cops when running rubocop (#9136) - * Relax RDoc version dependency (#9142) - -### Minor Enhancements - - * Regenerate supported mime types (#8542) - * Update include tag to be more permissive (#8618) - * Optimize `Jekyll::Utils.parse_date` (#8425) - * Update rubocop from 1.12 to 1.18 and min ruby from 2.4 to 2.5 (#8741) - * Always hide cache-dir contents from Git (#8798) - * Remove the warning about auto-regeneration on Windows (#8821) - * Propagate _data folder from theme (#8815) - * Support both tzinfo v1 and v2 alongwith non-half hour offsets. (#8880) - * Run vendor-mimes to update mime.types (#8940) - * Expose collection static files via `site.static_files` (#8961) - * Expose `basename` from `document.rb` as `name` to Liquid templates (#8761) - * Allow Configurable Converters on CSV (#8858) - * Introduce `theme` drop to expose theme-gem details (#9129) - * Relax version constraint to allow Rouge 4.x (#9134) - * Incrementally rebuild when a data file is changed (#8771) - * Support jekyll-sass-converter 3.x (#9132) - ### Site Enhancements * Improvements to CSS (#7834) From b32293cf67e194374faf2fa5f1aa16d3ec573e92 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 20 Oct 2022 21:27:35 +0530 Subject: [PATCH 118/290] Release post for v4.3.0 (#9157) Merge pull request 9157 --- .../2022-10-20-jekyll-4-3-0-released.markdown | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 docs/_posts/2022-10-20-jekyll-4-3-0-released.markdown diff --git a/docs/_posts/2022-10-20-jekyll-4-3-0-released.markdown b/docs/_posts/2022-10-20-jekyll-4-3-0-released.markdown new file mode 100644 index 00000000000..752e79658c4 --- /dev/null +++ b/docs/_posts/2022-10-20-jekyll-4-3-0-released.markdown @@ -0,0 +1,88 @@ +--- +title: 'Jekyll 4.3.0 Released' +date: 2022-10-20 10:20:22 -0500 +author: ashmaroli +version: 4.3.0 +category: release +--- + +Hello Jekyllers! + +The Jekyll team is happy to announce the release of `v4.3.0` shipping with some nice improvements and bug-fixes. + +## Improvements + +### Dependencies + +- Gem `webrick` is now a listed dependency. You no longer have to add the gem to your Gemfile when using Jekyll with +Ruby 3.0 or newer. +- You may now use Rouge v4 or continue using Rouge v3.x by explicitly mentioning the version in your Gemfile. +- Support for gem `tzinfo` v2 and non-half-hour offsets have been added. +- You will be able to use v3 of `jekyll-sass-converter` when it ships. + +### Builds + +- Added support for bundling and loading data files from within a theme-gem similar to existing theme-gem contents. +- Changes to data files at source will now be respected during incremental builds. +- `site.static_files` now include static files within a collection. +- You may now configure converters for CSV data. +- `.jekyll-cache` or its equivalent custom cache directory will be automatically ignored by Git. +- Vendor the current latest mime-types dataset for use with local development server. + +{% raw %} +### Liquid Templates + +- `basename` attribute of documents are now exposed to Liquid as `name`, for example `{{ page.name }}`. Excerpts delegate +to associated document attribute. +- Top-level variable `{{ theme }}` introduced to expose gemspec details of theme-gem. (Valid only when using theme-gem) +{% endraw %} + +## Bug-fixes + +Some noteworthy bug-fixes include: + +- Respect `BUNDLE_GEMFILE` when loading Jekyll plugins via Bundler. +- Prevent loading versions older than kramdown-2.3.1 as a security measure. +- Trigger livereloading even if the site has *no pages*. +- Ensure the expected class of theme config is returned following a merger. +- Enable BOM encoding only if configured encoding is 'UTF-8'. +- Respect server protocol while injecting livereload script. +- The table output for `--profile` stops printing incorrect "TOTALS" row. + +[The full list of changes](/docs/history/#v4-3-0) may be perused if interested. + +As always, we are grateful to the many contributors that helped improve the project codebase and documentation: + +Ashwin Maroli, Frank Taillandier, Matt Rogers, Parker Moore, Kelvin M. Klann, Josh Soref, Youssef Boulkaid, +Emily Grace Seville, Robert Martin, jaybe@jekyll, Ben Keith, Jonathan Darrer, Kaben, Mike Kasberg, Moncef Belyamani, +Phil Ross, Sesh Sadasivam, Adam Bell, Alaz Tetik, Alex Malaszkiewicz, Alex Saveau, Andreas Deininger, Andrew Davis, +Andrew Gutekanst, Andrii Abramov, Aram Akhavan, Atlas Cove, Attaphong Rattanaveerachanon, Ben Whetton, Chris Keefe, +Clayton Smith, Craig H Maynard, Curious Cat, Daniel Haim, Daniel Kehoe, Daryl Hepting, David Bruant, David Zhang, +Edson Jiménez, Eric Cousineau, Gary, Giuseppe Bertone, Ikko Ashimine, JJ, JT, Jeff Wilcox, Jeffrey Veen, +Jesse van der Pluijm, John Losito, Kantanat-Stamp, Kirstin Heidler, Korbs, Laurence Andrews, Liam Bigelow, Maik Riechert, +Meet Gor, Meg Gutshall, Michael Gerzabek, MichaelCordingley, Miguel Brandão, Nahin Khan, Nemo, Nicholas Paxford, +Nick Coish, Otto Urpelainen, Parikshit87, Phil Kirlin, Qasim Qureshi, Ricardo N Feliciano, Rishi Raj Jain, SNVMK, +SaintMalik, Sampath Sukesh Ravolaparthi, Shannon Kularathna, Shyam Mohan K, Takuya N, Tejas Bubane, Toshimaru, Tyler887, +Vinhas Kevin, alena-ko, fauno, lm, lucafrance, nusu, shorty, なつき + +--- + +### Announcement + +I would like to inform you that following this release, Jekyll will start developing towards a v5.0 milestone that will +**definitely contain breaking changes**. I have set up a [tentative roadmap at the GitHub repository][roadmap] to give everyone +a glimpse of the PROBABLE OUTCOME. Towards that end, we will no longer accept documentation fixes on `master`. The `4.3-stable` +branch will be used to build and deploy the site for https://jekyllrb.com. + +Jekyll 3.x series is now under security-maintenance phase. Only security patches will be released when necessary. + +Jekyll 4.x series will continue receiving bug-fixes and security-patches only. Depending on the state of progress towards v5.0, +there will be *at least* one minor version release serving as a transitionary version containing deprecations and bridge code +to ease the eventual upgrade to v5.0. + +[roadmap]: {{ site.repository }}/issues/9156 + +--- + +That is all for now. +Happy Jekyllin'!! From a81cd4276825ddb1b37442c273e16296c0409b50 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 20 Oct 2022 08:57:37 -0700 Subject: [PATCH 119/290] Update history to reflect merge of #9157 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 0b5bc03ad67..e43e71fedc1 100644 --- a/History.markdown +++ b/History.markdown @@ -137,6 +137,7 @@ * Improve links (http -> https) (#9064) * Update ruby version for macos guide (#9086) * Update posts.md (#9151) + * Release post for v4.3.0 (#9157) ### Site Enhancements From 9c2c01bb7a6e6c2e6711dcdb14f968dee4aaac2a Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 20 Oct 2022 21:32:59 +0530 Subject: [PATCH 120/290] Release :gem: v4.3.0 --- History.markdown | 2 +- docs/_config.yml | 2 +- docs/_docs/history.md | 152 ++++++++++++++++++++++++++++++++++++++++ docs/latest_version.txt | 2 +- lib/jekyll/version.rb | 2 +- 5 files changed, 156 insertions(+), 4 deletions(-) diff --git a/History.markdown b/History.markdown index e43e71fedc1..e62f6665dc7 100644 --- a/History.markdown +++ b/History.markdown @@ -1,4 +1,4 @@ -## HEAD +## 4.3.0 / 2022-10-20 ### Minor Enhancements diff --git a/docs/_config.yml b/docs/_config.yml index a86191a3608..bbc80d2b072 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,5 +1,5 @@ --- -version: 4.2.2 +version: 4.3.0 name: Jekyll • Simple, blog-aware, static sites description: Transform your plain text into static websites and blogs url: https://jekyllrb.com diff --git a/docs/_docs/history.md b/docs/_docs/history.md index f19be3b6a63..ddd98a3d360 100644 --- a/docs/_docs/history.md +++ b/docs/_docs/history.md @@ -4,6 +4,158 @@ permalink: "/docs/history/" note: This file is autogenerated. Edit /History.markdown instead. --- +## 4.3.0 / 2022-10-20 +{: #v4-3-0} + +### Minor Enhancements +{: #minor-enhancements-v4-3-0} + +- Add webrick as a dependency ([#8524]({{ site.repository }}/issues/8524)) +- Regenerate supported mime types ([#8542]({{ site.repository }}/issues/8542)) +- Update include tag to be more permissive ([#8618]({{ site.repository }}/issues/8618)) +- Optimize `Jekyll::Utils.parse_date` ([#8425]({{ site.repository }}/issues/8425)) +- Update rubocop from 1.12 to 1.18 and min ruby from 2.4 to 2.5 ([#8741]({{ site.repository }}/issues/8741)) +- Always hide cache-dir contents from Git ([#8798]({{ site.repository }}/issues/8798)) +- Remove the warning about auto-regeneration on Windows ([#8821]({{ site.repository }}/issues/8821)) +- Propagate _data folder from theme ([#8815]({{ site.repository }}/issues/8815)) +- Support both tzinfo v1 and v2 alongwith non-half hour offsets. ([#8880]({{ site.repository }}/issues/8880)) +- Run vendor-mimes to update mime.types ([#8940]({{ site.repository }}/issues/8940)) +- Expose collection static files via `site.static_files` ([#8961]({{ site.repository }}/issues/8961)) +- Expose `basename` from `document.rb` as `name` to Liquid templates ([#8761]({{ site.repository }}/issues/8761)) +- Allow Configurable Converters on CSV ([#8858]({{ site.repository }}/issues/8858)) +- Introduce `theme` drop to expose theme-gem details ([#9129]({{ site.repository }}/issues/9129)) +- Relax version constraint to allow Rouge 4.x ([#9134]({{ site.repository }}/issues/9134)) +- Incrementally rebuild when a data file is changed ([#8771]({{ site.repository }}/issues/8771)) +- Support jekyll-sass-converter 3.x ([#9132]({{ site.repository }}/issues/9132)) + +### Bug Fixes +{: #bug-fixes-v4-3-0} + +- fix: pin rubocop to 1.12 due to error with ruby 2.4 ([#8651]({{ site.repository }}/issues/8651)) +- Load Jekyll plugins from BUNDLE_GEMFILE location ([#8585]({{ site.repository }}/issues/8585)) +- fix(security): CVE-2021-28834 ([#8680]({{ site.repository }}/issues/8680)) +- Inject livereload script using `location.protocol` instead of `http:` ([#8718]({{ site.repository }}/issues/8718)) +- Respect collections_dir config within include tag ([#8756]({{ site.repository }}/issues/8756)) +- Fix regression in Convertible module from v4.2.0 ([#8786]({{ site.repository }}/issues/8786)) +- Revert [#7253]({{ site.repository }}/issues/7253): "Don't reset site.url to localhost:4000 by default" ([#8620]({{ site.repository }}/issues/8620)) +- Improve readability of CI logs ([#8877]({{ site.repository }}/issues/8877)) +- Fix deprecation message for missing doc method ([#8960]({{ site.repository }}/issues/8960)) +- Fix response header for content served via `jekyll serve` ([#8965]({{ site.repository }}/issues/8965)) +- Trigger livereload in sites without pages ([#8337]({{ site.repository }}/issues/8337)) +- Only enable BOM encoding option on UTF encodings ([#8363]({{ site.repository }}/issues/8363)) +- Ensure theme config is a `Jekyll::Configuration` object ([#8988]({{ site.repository }}/issues/8988)) +- Remove misleading totals row from `--profile` table ([#9039]({{ site.repository }}/issues/9039)) +- Unlock Psych dependency ([#9135]({{ site.repository }}/issues/9135)) +- Fix false positive conflicts for static files in a collection ([#9141]({{ site.repository }}/issues/9141)) + +### Development Fixes +{: #development-fixes-v4-3-0} + +- style: enable new cops ([#8538]({{ site.repository }}/issues/8538)) +- Allow dependabot to keep github actions up-to-date ([#8540]({{ site.repository }}/issues/8540)) +- Update actions/cache requirement to v2.1.3 ([#8543]({{ site.repository }}/issues/8543)) +- Pin rubocop version ([#8564]({{ site.repository }}/issues/8564)) +- style: add rubocop 1.9 cops ([#8567]({{ site.repository }}/issues/8567)) +- Cross Version Testing Locally and Faster CI ([#8610]({{ site.repository }}/issues/8610)) +- Use official Ruby setup GH action ([#8614]({{ site.repository }}/issues/8614)) +- Spell check action for markdown documentation ([#8675]({{ site.repository }}/issues/8675)) +- Update expect to cover docs/_posts ([#8677]({{ site.repository }}/issues/8677)) +- Bump check-spelling/check-spelling from 0.0.18 to 0.0.19 ([#8740]({{ site.repository }}/issues/8740)) +- Enable Rubocop accessor grouping, fix existing offenses ([#8293]({{ site.repository }}/issues/8293)) +- Tags:Highlight: Decomposed HTMLLegacy formatter ([#8623]({{ site.repository }}/issues/8623)) +- Relax Rubocop Dependency ([#8831]({{ site.repository }}/issues/8831)) +- Add a workflow to build gems consistently ([#8830]({{ site.repository }}/issues/8830)) +- Fix random test failures in TestExcerpt #to_liquid ([#8884]({{ site.repository }}/issues/8884)) +- Lock gem `psych` to `v3.x` ([#8918]({{ site.repository }}/issues/8918)) +- Fix typo in Bug Report template ([#8951]({{ site.repository }}/issues/8951)) +- Check symlink outside site_source without Pathutil ([#9015]({{ site.repository }}/issues/9015)) +- Stop testing with Rubies older than 2.7 on non-Windows ([#8955]({{ site.repository }}/issues/8955)) +- Bump actions/checkout from 2 to 3 ([#8986]({{ site.repository }}/issues/8986)) +- Remove git.io shortlinks from repo ([#9045]({{ site.repository }}/issues/9045)) +- Bump rubocop to 1.32 ([#9093]({{ site.repository }}/issues/9093)) +- Bump RuboCop to `1.36.x` ([#9125]({{ site.repository }}/issues/9125)) +- Use check-spelling/check-spelling@v0.0.20 ([#9111]({{ site.repository }}/issues/9111)) +- Disable pending cops when running rubocop ([#9136]({{ site.repository }}/issues/9136)) +- Relax RDoc version dependency ([#9142]({{ site.repository }}/issues/9142)) + +### Documentation + +- typo - do instead of don't ([#8518]({{ site.repository }}/issues/8518)) +- Document support for TSV files consistently ([#8488]({{ site.repository }}/issues/8488)) +- Add a disclaimer to tutorials involving Ruby code ([#8525]({{ site.repository }}/issues/8525)) +- Improve documentation on developing generators ([#8527]({{ site.repository }}/issues/8527)) +- Fixes typo in layouts_dir documentation ([#8532]({{ site.repository }}/issues/8532)) +- Fix i.e. typos in collections.md ([#8529]({{ site.repository }}/issues/8529)) +- Remove GitHub Pages content which is in GitHub docs ([#8533]({{ site.repository }}/issues/8533)) +- Step By Step Instructions Review ([#8399]({{ site.repository }}/issues/8399)) +- Fix typo in migrating from 3.0 to 4.0 page ([#8572]({{ site.repository }}/issues/8572)) +- Fix for important missing step in macOS Installation Docs: Add the Homebrew gems directory to the PATH ([#8496]({{ site.repository }}/issues/8496)) +- Use latest Jekyll-action configuration ([#8579]({{ site.repository }}/issues/8579)) +- docs: troubleshoot macOS with ARM64 architecture ([#8560]({{ site.repository }}/issues/8560)) +- docs: add overview of .jekyll-cache dir ([#8648]({{ site.repository }}/issues/8648)) +- docs: clarify where .jekyll-metadata comes from ([#8646]({{ site.repository }}/issues/8646)) +- Razorops cicd added ([#8656]({{ site.repository }}/issues/8656)) +- Specify default port and host for serve commands in docs ([#8624]({{ site.repository }}/issues/8624)) +- Update third-party.md ([#8652]({{ site.repository }}/issues/8652)) +- Add documentation for Sass configuration options ([#8587]({{ site.repository }}/issues/8587)) +- Add formcarry to forms section ([#8471]({{ site.repository }}/issues/8471)) +- Add step to set SDKROOT ([#8478]({{ site.repository }}/issues/8478)) +- Improve the "Markdown Options" Docs ([#8681]({{ site.repository }}/issues/8681)) +- Add 'webrick' warning note to "Quickstart" Docs ([#8727]({{ site.repository }}/issues/8727)) +- Update windows.md ([#8701]({{ site.repository }}/issues/8701)) +- IRC networks - Libera, Freenode ([#8706]({{ site.repository }}/issues/8706)) +- Improve GitHub Flavored Markdown Docs ([#8684]({{ site.repository }}/issues/8684)) +- Fixing URL in MacOS install for rbenv-doctor ([#8693]({{ site.repository }}/issues/8693)) +- Fix adjective in `troubleshooting.md` document ([#8777]({{ site.repository }}/issues/8777)) +- Goodbye Frank. We'll miss you. 💔 ([#8807]({{ site.repository }}/issues/8807)) +- Update index.html: Grammar fix. ([#8803]({{ site.repository }}/issues/8803)) +- Prefer Libera. Remove Freenode. ([#8811]({{ site.repository }}/issues/8811)) +- Update feature_request.md ([#8797]({{ site.repository }}/issues/8797)) +- Remove AWS Amplify from the showcase ([#8812]({{ site.repository }}/issues/8812)) +- Move Frank to Emeritus Core Team Members ([#8813]({{ site.repository }}/issues/8813)) +- Release post for v4.2.1 ([#8818]({{ site.repository }}/issues/8818)) +- Update CircleCI example ([#8829]({{ site.repository }}/issues/8829)) +- Fix typo ([#8835]({{ site.repository }}/issues/8835)) +- Added docs for running locally ([#8852]({{ site.repository }}/issues/8852)) +- Linting README.markdown ([#8900]({{ site.repository }}/issues/8900)) +- Remove text on GITHUB_TOKEN which is now built-in ([#8907]({{ site.repository }}/issues/8907)) +- Add Security Policy document ([#8823]({{ site.repository }}/issues/8823)) +- Manage repository meta documents consistently ([#8908]({{ site.repository }}/issues/8908)) +- docs: add Layer0 deployment guide ([#8915]({{ site.repository }}/issues/8915)) +- docs: Update REAMDE generated by `jekyll new-theme` ([#8919]({{ site.repository }}/issues/8919)) +- Update resources.md ([#8925]({{ site.repository }}/issues/8925)) +- Rewrite documentation on installing plugins ([#8921]({{ site.repository }}/issues/8921)) +- Improve maintainers guide on releasing a new version ([#8928]({{ site.repository }}/issues/8928)) +- Fix link for "CloudSh" ([#8934]({{ site.repository }}/issues/8934)) +- Recommend using `actions/cache` in GitHub Actions documentation ([#8948]({{ site.repository }}/issues/8948)) +- Remove references to EOL hakiri.io service ([#8946]({{ site.repository }}/issues/8946)) +- Release post for v4.2.2 ([#8982]({{ site.repository }}/issues/8982)) +- Document releasing off `*-stable` branches ([#8984]({{ site.repository }}/issues/8984)) +- Update document by fix yaml syntax error ([#8991]({{ site.repository }}/issues/8991)) +- Enhance option's case for Jekyll configuration ([#8992]({{ site.repository }}/issues/8992)) +- Fix typo in `_docs/deployment/manual.md` ([#8997]({{ site.repository }}/issues/8997)) +- Add quiet/verbose options ([#8996]({{ site.repository }}/issues/8996)) +- Update README.markdown re IRC Pointer ([#9005]({{ site.repository }}/issues/9005)) +- Remove Aerobatic ([#9007]({{ site.repository }}/issues/9007)) +- Add Jekyll 3.9.2 release post to 'master' branch ([#9013]({{ site.repository }}/issues/9013)) +- Simplify macOS installation docs ([#8993]({{ site.repository }}/issues/8993)) +- Improve document about Github Actions section ([#8853]({{ site.repository }}/issues/8853)) +- Update permalinks.md ([#9017]({{ site.repository }}/issues/9017)) +- Add clarity to docs on permalinks placeholders and builtins ([#8995]({{ site.repository }}/issues/8995)) +- Remove Ionic Framework site from showcase ([#9057]({{ site.repository }}/issues/9057)) +- Windows: describe which option to choose ([#9049]({{ site.repository }}/issues/9049)) +- Improve links (http -> https) ([#9064]({{ site.repository }}/issues/9064)) +- Update ruby version for macos guide ([#9086]({{ site.repository }}/issues/9086)) +- Update posts.md ([#9151]({{ site.repository }}/issues/9151)) +- Release post for v4.3.0 ([#9157]({{ site.repository }}/issues/9157)) + +### Site Enhancements +{: #site-enhancements-v4-3-0} + +- Improvements to CSS ([#7834]({{ site.repository }}/issues/7834)) +- Slightly update lang `sh` code-block styling ([#8857]({{ site.repository }}/issues/8857)) + + ## 4.2.2 / 2022-03-03 {: #v4-2-2} diff --git a/docs/latest_version.txt b/docs/latest_version.txt index af8c8ec7c13..80895903a15 100644 --- a/docs/latest_version.txt +++ b/docs/latest_version.txt @@ -1 +1 @@ -4.2.2 +4.3.0 diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index 5a1c19d2d26..246f7d748cf 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Jekyll - VERSION = "4.2.2" + VERSION = "4.3.0" end From 2b56ad4f6de264d1fb60baa218d52dc51ebf095d Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 20 Oct 2022 21:57:37 +0530 Subject: [PATCH 121/290] Fix spelling errors in History document --- .github/actions/spelling/allow.txt | 3 +++ .github/actions/spelling/expect.txt | 2 ++ History.markdown | 8 ++++---- docs/_docs/history.md | 8 ++++---- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt index abb244b05e2..cb2757cc60b 100644 --- a/.github/actions/spelling/allow.txt +++ b/.github/actions/spelling/allow.txt @@ -1,2 +1,5 @@ statictastic Statictastic +Linting +hakiri +built-ins diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index 83c5d112710..5738b15e033 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -128,6 +128,7 @@ Debian debuggability defunkt delegators +dependabot deployer deps dest @@ -565,6 +566,7 @@ SFTP shingo shopify shortlog +shortlinks shoulda sieversii sigpipe diff --git a/History.markdown b/History.markdown index e62f6665dc7..70686560c60 100644 --- a/History.markdown +++ b/History.markdown @@ -10,7 +10,7 @@ * Always hide cache-dir contents from Git (#8798) * Remove the warning about auto-regeneration on Windows (#8821) * Propagate _data folder from theme (#8815) - * Support both tzinfo v1 and v2 alongwith non-half hour offsets. (#8880) + * Support both tzinfo v1 and v2 along with non-half hour offsets. (#8880) * Run vendor-mimes to update mime.types (#8940) * Expose collection static files via `site.static_files` (#8961) * Expose `basename` from `document.rb` as `name` to Liquid templates (#8761) @@ -84,7 +84,7 @@ * docs: troubleshoot macOS with ARM64 architecture (#8560) * docs: add overview of .jekyll-cache dir (#8648) * docs: clarify where .jekyll-metadata comes from (#8646) - * Razorops cicd added (#8656) + * Razorops CI/CD added (#8656) * Specify default port and host for serve commands in docs (#8624) * Update third-party.md (#8652) * Add documentation for Sass configuration options (#8587) @@ -112,7 +112,7 @@ * Add Security Policy document (#8823) * Manage repository meta documents consistently (#8908) * docs: add Layer0 deployment guide (#8915) - * docs: Update REAMDE generated by `jekyll new-theme` (#8919) + * docs: Update README generated by `jekyll new-theme` (#8919) * Update resources.md (#8925) * Rewrite documentation on installing plugins (#8921) * Improve maintainers guide on releasing a new version (#8928) @@ -131,7 +131,7 @@ * Simplify macOS installation docs (#8993) * Improve document about Github Actions section (#8853) * Update permalinks.md (#9017) - * Add clarity to docs on permalinks placeholders and builtins (#8995) + * Add clarity to docs on permalinks placeholders and built-ins (#8995) * Remove Ionic Framework site from showcase (#9057) * Windows: describe which option to choose (#9049) * Improve links (http -> https) (#9064) diff --git a/docs/_docs/history.md b/docs/_docs/history.md index ddd98a3d360..93c3b781819 100644 --- a/docs/_docs/history.md +++ b/docs/_docs/history.md @@ -18,7 +18,7 @@ note: This file is autogenerated. Edit /History.markdown instead. - Always hide cache-dir contents from Git ([#8798]({{ site.repository }}/issues/8798)) - Remove the warning about auto-regeneration on Windows ([#8821]({{ site.repository }}/issues/8821)) - Propagate _data folder from theme ([#8815]({{ site.repository }}/issues/8815)) -- Support both tzinfo v1 and v2 alongwith non-half hour offsets. ([#8880]({{ site.repository }}/issues/8880)) +- Support both tzinfo v1 and v2 along with non-half hour offsets. ([#8880]({{ site.repository }}/issues/8880)) - Run vendor-mimes to update mime.types ([#8940]({{ site.repository }}/issues/8940)) - Expose collection static files via `site.static_files` ([#8961]({{ site.repository }}/issues/8961)) - Expose `basename` from `document.rb` as `name` to Liquid templates ([#8761]({{ site.repository }}/issues/8761)) @@ -94,7 +94,7 @@ note: This file is autogenerated. Edit /History.markdown instead. - docs: troubleshoot macOS with ARM64 architecture ([#8560]({{ site.repository }}/issues/8560)) - docs: add overview of .jekyll-cache dir ([#8648]({{ site.repository }}/issues/8648)) - docs: clarify where .jekyll-metadata comes from ([#8646]({{ site.repository }}/issues/8646)) -- Razorops cicd added ([#8656]({{ site.repository }}/issues/8656)) +- Razorops CI/CD added ([#8656]({{ site.repository }}/issues/8656)) - Specify default port and host for serve commands in docs ([#8624]({{ site.repository }}/issues/8624)) - Update third-party.md ([#8652]({{ site.repository }}/issues/8652)) - Add documentation for Sass configuration options ([#8587]({{ site.repository }}/issues/8587)) @@ -122,7 +122,7 @@ note: This file is autogenerated. Edit /History.markdown instead. - Add Security Policy document ([#8823]({{ site.repository }}/issues/8823)) - Manage repository meta documents consistently ([#8908]({{ site.repository }}/issues/8908)) - docs: add Layer0 deployment guide ([#8915]({{ site.repository }}/issues/8915)) -- docs: Update REAMDE generated by `jekyll new-theme` ([#8919]({{ site.repository }}/issues/8919)) +- docs: Update README generated by `jekyll new-theme` ([#8919]({{ site.repository }}/issues/8919)) - Update resources.md ([#8925]({{ site.repository }}/issues/8925)) - Rewrite documentation on installing plugins ([#8921]({{ site.repository }}/issues/8921)) - Improve maintainers guide on releasing a new version ([#8928]({{ site.repository }}/issues/8928)) @@ -141,7 +141,7 @@ note: This file is autogenerated. Edit /History.markdown instead. - Simplify macOS installation docs ([#8993]({{ site.repository }}/issues/8993)) - Improve document about Github Actions section ([#8853]({{ site.repository }}/issues/8853)) - Update permalinks.md ([#9017]({{ site.repository }}/issues/9017)) -- Add clarity to docs on permalinks placeholders and builtins ([#8995]({{ site.repository }}/issues/8995)) +- Add clarity to docs on permalinks placeholders and built-ins ([#8995]({{ site.repository }}/issues/8995)) - Remove Ionic Framework site from showcase ([#9057]({{ site.repository }}/issues/9057)) - Windows: describe which option to choose ([#9049]({{ site.repository }}/issues/9049)) - Improve links (http -> https) ([#9064]({{ site.repository }}/issues/9064)) From a613eb2d823919ad536063da377fc4582ce0904a Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 20 Oct 2022 22:21:44 +0530 Subject: [PATCH 122/290] Disable critical GH Actions on `master` To mark `master` as in v5 development mode --- .../{workflows/third-party.yml => actions/third-party.disabled} | 0 .github/workflows/docs.yml | 2 +- .github/workflows/release.yml | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) rename .github/{workflows/third-party.yml => actions/third-party.disabled} (100%) diff --git a/.github/workflows/third-party.yml b/.github/actions/third-party.disabled similarity index 100% rename from .github/workflows/third-party.yml rename to .github/actions/third-party.disabled diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index a24fffd0c31..837ea18e5c2 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -3,7 +3,7 @@ name: Build and deploy Jekyll documentation site on: push: branches: - - master + - "4.3-stable" env: RUBY_VERSION: 2.7 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3585815ac47..39d8fd824f8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,6 @@ name: Release Gem on: push: branches: - - master - "*-stable" paths: - "lib/**/version.rb" From 556febb436c93a476365a9235403c82d3f9e74be Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 20 Oct 2022 22:46:28 +0530 Subject: [PATCH 123/290] Mark initiation of v5.0 development To prevent users from pointing their Gemfile to the repository and breaking their site. --- lib/jekyll/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index 246f7d748cf..eeba3b26cd9 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Jekyll - VERSION = "4.3.0" + VERSION = "5.0.0.dev" end From 390b1f006bebdfa7e46c83831879a17a51cded52 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Fri, 21 Oct 2022 23:22:47 +0530 Subject: [PATCH 124/290] Revert back to developing 4.3.x This reverts commit 556febb436c93a476365a9235403c82d3f9e74be. This reverts commit a613eb2d823919ad536063da377fc4582ce0904a. --- .github/workflows/docs.yml | 2 +- .github/workflows/release.yml | 1 + .../{actions/third-party.disabled => workflows/third-party.yml} | 0 lib/jekyll/version.rb | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) rename .github/{actions/third-party.disabled => workflows/third-party.yml} (100%) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 837ea18e5c2..a24fffd0c31 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -3,7 +3,7 @@ name: Build and deploy Jekyll documentation site on: push: branches: - - "4.3-stable" + - master env: RUBY_VERSION: 2.7 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 39d8fd824f8..3585815ac47 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,6 +3,7 @@ name: Release Gem on: push: branches: + - master - "*-stable" paths: - "lib/**/version.rb" diff --git a/.github/actions/third-party.disabled b/.github/workflows/third-party.yml similarity index 100% rename from .github/actions/third-party.disabled rename to .github/workflows/third-party.yml diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index eeba3b26cd9..246f7d748cf 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Jekyll - VERSION = "5.0.0.dev" + VERSION = "4.3.0" end From 7206b7f9ef955de3db83e8bcf5404dabe91f7d61 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Wed, 26 Oct 2022 22:06:32 +0530 Subject: [PATCH 125/290] Respect user-defined name attribute in documents (#9167) Merge pull request 9167 --- lib/jekyll/drops/document_drop.rb | 5 ++++- lib/jekyll/drops/excerpt_drop.rb | 2 +- test/source/_roles/named.md | 5 +++++ test/source/_roles/unnamed.md | 4 ++++ test/test_document.rb | 17 +++++++++++++++++ 5 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 test/source/_roles/named.md create mode 100644 test/source/_roles/unnamed.md diff --git a/lib/jekyll/drops/document_drop.rb b/lib/jekyll/drops/document_drop.rb index 00e51e20594..0cff3741074 100644 --- a/lib/jekyll/drops/document_drop.rb +++ b/lib/jekyll/drops/document_drop.rb @@ -12,7 +12,6 @@ class DocumentDrop < Drop mutable false delegate_method_as :relative_path, :path - delegate_method_as :basename, :name private delegate_method_as :data, :fallback_data delegate_methods :id, :output, :content, :to_s, :relative_path, :url, :date @@ -26,6 +25,10 @@ def excerpt fallback_data["excerpt"].to_s end + def name + fallback_data["name"] || @obj.basename + end + def <=>(other) return nil unless other.is_a? DocumentDrop diff --git a/lib/jekyll/drops/excerpt_drop.rb b/lib/jekyll/drops/excerpt_drop.rb index 64a8aa7daaa..82d3cdf827b 100644 --- a/lib/jekyll/drops/excerpt_drop.rb +++ b/lib/jekyll/drops/excerpt_drop.rb @@ -16,7 +16,7 @@ def excerpt end def name - @obj.doc.basename + @obj.doc.data["name"] || @obj.doc.basename end end end diff --git a/test/source/_roles/named.md b/test/source/_roles/named.md new file mode 100644 index 00000000000..dfb6847614a --- /dev/null +++ b/test/source/_roles/named.md @@ -0,0 +1,5 @@ +--- +name: launcher +--- + +`name` defined in front matter. diff --git a/test/source/_roles/unnamed.md b/test/source/_roles/unnamed.md new file mode 100644 index 00000000000..c35bf6b3a0a --- /dev/null +++ b/test/source/_roles/unnamed.md @@ -0,0 +1,4 @@ +--- +--- + +No `name` in front matter. diff --git a/test/test_document.rb b/test/test_document.rb index e980b1f5dc3..f5f5cce6ec0 100644 --- a/test/test_document.rb +++ b/test/test_document.rb @@ -159,6 +159,23 @@ def setup_document_with_dates(filename) should "output its relative path as path in Liquid" do assert_equal "_methods/configuration.md", @document.to_liquid["path"] end + + context "when rendered with Liquid" do + should "respect the front matter definition" do + site = fixture_site("collections" => ["roles"]).tap(&:process) + docs = site.collections["roles"].docs + + # Ruby context: doc.basename is aliased as doc.to_liquid["name"] by default. + + document = docs.detect { |d| d.relative_path == "_roles/unnamed.md" } + assert_equal "unnamed.md", document.basename + assert_equal "unnamed.md", document.to_liquid["name"] + + document = docs.detect { |d| d.relative_path == "_roles/named.md" } + assert_equal "named.md", document.basename + assert_equal "launcher", document.to_liquid["name"] + end + end end context "a document as part of a collection with front matter defaults" do From 04123c0caddfec9f108805119466624cef9b5212 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 26 Oct 2022 09:36:34 -0700 Subject: [PATCH 126/290] Update history to reflect merge of #9167 [ci skip] --- History.markdown | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/History.markdown b/History.markdown index 70686560c60..a42045671de 100644 --- a/History.markdown +++ b/History.markdown @@ -1,3 +1,9 @@ +## HEAD + +### Bug Fixes + + * Respect user-defined name attribute in documents (#9167) + ## 4.3.0 / 2022-10-20 ### Minor Enhancements From 5367a0261db9401c632de7d53ca56680657d9d5e Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Wed, 26 Oct 2022 22:08:14 +0530 Subject: [PATCH 127/290] Revert "Incrementally rebuild when a data file is changed (#8771)" (#9170) Merge pull request 9170 --- features/incremental_rebuild.feature | 53 ------------------ lib/jekyll.rb | 2 - lib/jekyll/data_entry.rb | 83 ---------------------------- lib/jekyll/data_hash.rb | 61 -------------------- lib/jekyll/drops/site_drop.rb | 7 +-- lib/jekyll/readers/data_reader.rb | 9 +-- lib/jekyll/utils.rb | 9 +-- test/source/_data/boolean.yml | 1 - test/source/_data/languages_plus.yml | 4 -- test/test_data_entry.rb | 34 ------------ test/test_data_hash.rb | 57 ------------------- 11 files changed, 5 insertions(+), 315 deletions(-) delete mode 100644 lib/jekyll/data_entry.rb delete mode 100644 lib/jekyll/data_hash.rb delete mode 100644 test/source/_data/boolean.yml delete mode 100644 test/source/_data/languages_plus.yml delete mode 100644 test/test_data_entry.rb delete mode 100644 test/test_data_hash.rb diff --git a/features/incremental_rebuild.feature b/features/incremental_rebuild.feature index 8eacaf23171..2d22d2e1940 100644 --- a/features/incremental_rebuild.feature +++ b/features/incremental_rebuild.feature @@ -67,59 +67,6 @@ Feature: Incremental rebuild And the _site directory should exist And I should see "Basic Site with include tag: Regenerated by Jekyll" in "_site/index.html" - Scenario: Rebuild when a data file is changed - Given I have a _data directory - And I have a "_data/colors.yml" file that contains "[red, green, blue]" - And I have a _data/members/core directory - And I have a "_data/members/core/emeritus.yml" file with content: - """ - - name: John Doe - role: Admin - """ - And I have an _includes directory - And I have an "_includes/about.html" file with content: - """ -
    - {% for entry in site.data.members.core.emeritus %} -
  • {{ entry.name }}
    • - {% endfor %} -
- """ - And I have a _layouts directory - And I have a page layout that contains "{{ content }}\n\n{% include about.html %}" - And I have a home layout that contains "{{ content }}\n\nGenerated by Jekyll" - And I have a "_layouts/post.html" page with layout "page" that contains "{{ content }}" - And I have a "_layouts/static.html" page with layout "home" that contains "{{ content }}" - And I have an "index.html" page with layout "home" that contains "{{ site.data.colors | join: '_' }}" - And I have an "about.html" page with layout "page" that contains "About Us" - And I have a configuration file with "collections_dir" set to "collections" - And I have a collections/_posts directory - And I have the following post within the "collections" directory: - | title | date | layout | content | - | Table | 2009-03-26 | post | Post with data dependency | - | Wargames | 2009-03-27 | static | Post without data dependency | - When I run jekyll build -IV - Then I should get a zero exit status - And the _site directory should exist - And I should see "red_green_blue" in "_site/index.html" - And I should see "John Doe -- Admin" in "_site/about.html" - And I should see "Rendering: index.html" in the build output - And I should see "Rendering: _posts/2009-03-27-wargames.markdown" in the build output - When I wait 1 second - Then I have a "_data/members/core/emeritus.yml" file with content: - """ - - name: Jane Doe - role: Admin - """ - When I run jekyll build -IV - Then I should get a zero exit status - And the _site directory should exist - And I should see "red_green_blue" in "_site/index.html" - And I should see "Jane Doe -- Admin" in "_site/about.html" - And I should see "Rendering: _posts/2009-03-26-table.markdown" in the build output - But I should not see "Rendering: index.html" in the build output - And I should not see "Rendering: _posts/2009-03-27-wargames.markdown" in the build output - Scenario: Rebuild when a dependency of document in custom collection_dir is changed Given I have a _includes directory And I have a configuration file with "collections_dir" set to "collections" diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 49b71e70d0f..231f8fd89c9 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -45,8 +45,6 @@ module Jekyll autoload :Collection, "jekyll/collection" autoload :Configuration, "jekyll/configuration" autoload :Convertible, "jekyll/convertible" - autoload :DataEntry, "jekyll/data_entry" - autoload :DataHash, "jekyll/data_hash" autoload :Deprecator, "jekyll/deprecator" autoload :Document, "jekyll/document" autoload :EntryFilter, "jekyll/entry_filter" diff --git a/lib/jekyll/data_entry.rb b/lib/jekyll/data_entry.rb deleted file mode 100644 index fa26722174f..00000000000 --- a/lib/jekyll/data_entry.rb +++ /dev/null @@ -1,83 +0,0 @@ -# frozen_string_literal: true - -module Jekyll - class DataEntry - attr_accessor :context - attr_reader :data - - # Create a Jekyll wrapper for given parsed data object. - # - # site - The current Jekyll::Site instance. - # abs_path - Absolute path to the data source file. - # parsed_data - Parsed representation of data source file contents. - # - # Returns nothing. - def initialize(site, abs_path, parsed_data) - @site = site - @path = abs_path - @data = parsed_data - end - - # Liquid representation of current instance is the parsed data object. - # - # Mark as a dependency for regeneration here since every renderable object primarily uses the - # parsed data object while the parent resource is being rendered by Liquid. Accessing the data - # object directly via Ruby interface `#[]()` is outside the scope of regeneration. - # - # FIXME: Marking as dependency on every call is non-ideal. Optimize at later day. - # - # Returns the parsed data object. - def to_liquid - add_regenerator_dependencies if incremental_build? - @data - end - - # -- Overrides to maintain backwards compatibility -- - - # Any missing method will be forwarded to the underlying data object stored in the instance - # variable `@data`. - def method_missing(method, *args, &block) - @data.respond_to?(method) ? @data.send(method, *args, &block) : super - end - - def respond_to_missing?(method, *) - @data.respond_to?(method) || super - end - - def <=>(other) - data <=> (other.is_a?(self.class) ? other.data : other) - end - - def ==(other) - data == (other.is_a?(self.class) ? other.data : other) - end - - # Explicitly defined to bypass re-routing from `method_missing` hook for greater performance. - # - # Returns string representation of parsed data object. - def inspect - @data.inspect - end - - private - - def incremental_build? - @incremental = @site.config["incremental"] if @incremental.nil? - @incremental - end - - def add_regenerator_dependencies - page = context.registers[:page] - return unless page&.key?("path") - - absolute_path = \ - if page["collection"] - @site.in_source_dir(@site.config["collections_dir"], page["path"]) - else - @site.in_source_dir(page["path"]) - end - - @site.regenerator.add_dependency(absolute_path, @path) - end - end -end diff --git a/lib/jekyll/data_hash.rb b/lib/jekyll/data_hash.rb deleted file mode 100644 index 37ef510b681..00000000000 --- a/lib/jekyll/data_hash.rb +++ /dev/null @@ -1,61 +0,0 @@ -# frozen_string_literal: true - -module Jekyll - # A class that behaves very similar to Ruby's `Hash` class yet different in how it is handled by - # Liquid. This class emulates Hash by delegation instead of inheritance to minimize overridden - # methods especially since some Hash methods returns another Hash instance instead of the - # subclass instance. - class DataHash - # - # Delegate given (zero-arity) method(s) to the Hash object stored in instance variable - # `@registry`. - # NOTE: Avoiding the use of `Forwardable` module's `def_delegators` for preventing unnecessary - # creation of interim objects on multiple calls. - def self.delegate_to_registry(*symbols) - symbols.each { |sym| define_method(sym) { @registry.send(sym) } } - end - private_class_method :delegate_to_registry - - # -- core instance methods -- - - attr_accessor :context - - def initialize - @registry = {} - end - - def [](key) - @registry[key].tap do |value| - value.context = context if value.respond_to?(:context=) - end - end - - # `Hash#to_liquid` returns the Hash instance itself. - # Mimic that behavior by returning `self` instead of returning the `@registry` variable value. - def to_liquid - self - end - - # -- supplementary instance methods to emulate Hash -- - - delegate_to_registry :freeze, :inspect - - def merge(other, &block) - merged_registry = @registry.merge(other, &block) - dup.tap { |d| d.instance_variable_set(:@registry, merged_registry) } - end - - def merge!(other, &block) - @registry.merge!(other, &block) - self - end - - def method_missing(method, *args, &block) - @registry.send(method, *args, &block) - end - - def respond_to_missing?(method, *) - @registry.respond_to?(method) - end - end -end diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb index 13c5757b445..cc3c60fb619 100644 --- a/lib/jekyll/drops/site_drop.rb +++ b/lib/jekyll/drops/site_drop.rb @@ -7,6 +7,7 @@ class SiteDrop < Drop mutable false + delegate_method_as :site_data, :data delegate_methods :time, :pages, :static_files, :tags, :categories private delegate_method_as :config, :fallback_data @@ -23,12 +24,6 @@ def key?(key) (key != "posts" && @obj.collections.key?(key)) || super end - def data - @obj.site_data.tap do |value| - value.context = @context if value.respond_to?(:context=) - end - end - def posts @site_posts ||= @obj.posts.docs.sort { |a, b| b <=> a } end diff --git a/lib/jekyll/readers/data_reader.rb b/lib/jekyll/readers/data_reader.rb index f95556da7a7..80b57bd6bd7 100644 --- a/lib/jekyll/readers/data_reader.rb +++ b/lib/jekyll/readers/data_reader.rb @@ -6,7 +6,7 @@ class DataReader def initialize(site, in_source_dir: nil) @site = site - @content = DataHash.new + @content = {} @entry_filter = EntryFilter.new(site) @in_source_dir = in_source_dir || @site.method(:in_source_dir) @source_dir = @in_source_dir.call("/") @@ -24,8 +24,6 @@ def read(dir) @content end - # rubocop:disable Metrics/AbcSize - # Read and parse all .yaml, .yml, .json, .csv and .tsv # files under and add them to the variable. # @@ -45,14 +43,13 @@ def read_data_to(dir, data) next if @entry_filter.symlink?(path) if File.directory?(path) - read_data_to(path, data[sanitize_filename(entry)] = DataHash.new) + read_data_to(path, data[sanitize_filename(entry)] = {}) else key = sanitize_filename(File.basename(entry, ".*")) - data[key] = DataEntry.new(site, path, read_data_file(path)) + data[key] = read_data_file(path) end end end - # rubocop:enable Metrics/AbcSize # Determines how to read a data file. # diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index 8eb807d71cc..2a965270481 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -47,14 +47,7 @@ def deep_merge_hashes!(target, overwrite) end def mergable?(value) - case value - when Hash, Drops::Drop, DataHash - true - when DataEntry - mergable?(value.data) - else - false - end + value.is_a?(Hash) || value.is_a?(Drops::Drop) end def duplicable?(obj) diff --git a/test/source/_data/boolean.yml b/test/source/_data/boolean.yml deleted file mode 100644 index fe75c80bca5..00000000000 --- a/test/source/_data/boolean.yml +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/test/source/_data/languages_plus.yml b/test/source/_data/languages_plus.yml deleted file mode 100644 index fb98401bd3f..00000000000 --- a/test/source/_data/languages_plus.yml +++ /dev/null @@ -1,4 +0,0 @@ -- java -- ruby -- rust -- golang diff --git a/test/test_data_entry.rb b/test/test_data_entry.rb deleted file mode 100644 index dc6e8e93b10..00000000000 --- a/test/test_data_entry.rb +++ /dev/null @@ -1,34 +0,0 @@ -# frozen_string_literal: true - -require "helper" - -class TestDataEntry < JekyllUnitTest - context "Data Entry" do - setup do - site = fixture_site - site.read - @data_hash = site.site_data - end - - should "expose underlying data object es Liquid representation" do - subject = @data_hash["languages"] - assert_equal Jekyll::DataEntry, subject.class - assert_equal subject.data, subject.to_liquid - end - - should "respond to `#[](key)` when expected to but raise Exception otherwise" do - greeting = @data_hash["greetings"] - assert greeting["foo"] - - boolean = @data_hash["boolean"] # the value is a Boolean. - assert_raises(NoMethodError) { boolean["foo"] } - end - - should "compare with another instance of same class using underlying data" do - assert_equal( - [%w(java ruby), %w(java ruby rust golang)], - [@data_hash["languages_plus"], @data_hash["languages"]].sort - ) - end - end -end diff --git a/test/test_data_hash.rb b/test/test_data_hash.rb deleted file mode 100644 index 022c2543312..00000000000 --- a/test/test_data_hash.rb +++ /dev/null @@ -1,57 +0,0 @@ -# frozen_string_literal: true - -require "helper" - -class TestDataHash < JekyllUnitTest - context "Data Hash" do - setup do - @site = fixture_site - @site.read - end - - should "only mimic a ::Hash instance" do - subject = @site.site_data - assert_equal Jekyll::DataHash, subject.class - refute subject.is_a?(Hash) - - copy = subject.dup - assert copy["greetings"]["foo"] - assert_includes copy.dig("greetings", "foo"), "Hello!" - - copy["greetings"] = "Hola!" - assert_equal "Hola!", copy["greetings"] - refute copy["greetings"]["foo"] - - frozen_data_hash = Jekyll::DataHash.new.freeze - assert_raises(FrozenError) { frozen_data_hash["lorem"] = "ipsum" } - end - - should "be mergable" do - alpha = Jekyll::DataHash.new - beta = Jekyll::DataHash.new - - assert_equal "{}", alpha.inspect - sample_data = { "foo" => "bar" } - - assert_equal sample_data["foo"], alpha.merge(sample_data)["foo"] - assert_equal alpha.class, alpha.merge(sample_data).class - assert_empty alpha - - beta.merge!(sample_data) - assert_equal sample_data["foo"], alpha.merge(beta)["foo"] - assert_equal alpha.class, alpha.merge(beta).class - assert_empty alpha - - beta.merge!(@site.site_data) - assert_equal alpha.class, beta.class - assert_includes beta.dig("greetings", "foo"), "Hello!" - - assert_empty alpha - assert_equal sample_data["foo"], Jekyll::Utils.deep_merge_hashes(alpha, sample_data)["foo"] - assert_includes( - Jekyll::Utils.deep_merge_hashes(alpha, beta).dig("greetings", "foo"), - "Hello!" - ) - end - end -end From eef8030950e3d98fd6ad29b528bb3395316f3243 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 26 Oct 2022 09:38:16 -0700 Subject: [PATCH 128/290] Update history to reflect merge of #9170 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index a42045671de..f06a1882e77 100644 --- a/History.markdown +++ b/History.markdown @@ -3,6 +3,7 @@ ### Bug Fixes * Respect user-defined name attribute in documents (#9167) + * Revert "Incrementally rebuild when a data file is changed" (#9170) ## 4.3.0 / 2022-10-20 From 28d4eacdcb6484930a9b7a4ac647bcc699421efe Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Wed, 26 Oct 2022 23:19:15 +0530 Subject: [PATCH 129/290] Release post for v4.3.1 (#9171) Merge pull request 9171 --- .../2022-10-26-jekyll-4-3-1-released.markdown | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 docs/_posts/2022-10-26-jekyll-4-3-1-released.markdown diff --git a/docs/_posts/2022-10-26-jekyll-4-3-1-released.markdown b/docs/_posts/2022-10-26-jekyll-4-3-1-released.markdown new file mode 100644 index 00000000000..77cd9625de2 --- /dev/null +++ b/docs/_posts/2022-10-26-jekyll-4-3-1-released.markdown @@ -0,0 +1,21 @@ +--- +title: 'Jekyll 4.3.1 Released' +date: 2022-10-26 19:09:42 +0530 +author: ashmaroli +version: 4.3.1 +category: release +--- + +Hello Jekyllers! + +We're shipping `v4.3.1` containing fixes for two issues with v4.3.0: + - Jekyll now respects user-defined `name` attribute for collection documents when accessed in Liquid templates. + - Revert the changes made to trigger incremental rebuilds when data files are changed. + +Thanks to the users who took the time to report the issues to us. +Happy Jekyllin' + +P.S. Development towards v5 has taken a back seat as of now. I plan on releasing a v4.4.0 instead. +That said, please feel free to comment on the [tentative roadmap to v5][roadmap]. + +[roadmap]: {{ site.repository }}/issues/9156 From 8cc0640a6893dba7a21717bfe1e5df3bd216fb0a Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 26 Oct 2022 10:49:17 -0700 Subject: [PATCH 130/290] Update history to reflect merge of #9171 [ci skip] --- History.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.markdown b/History.markdown index f06a1882e77..365eec6f996 100644 --- a/History.markdown +++ b/History.markdown @@ -5,6 +5,10 @@ * Respect user-defined name attribute in documents (#9167) * Revert "Incrementally rebuild when a data file is changed" (#9170) +### Documentation + + * Release post for v4.3.1 (#9171) + ## 4.3.0 / 2022-10-20 ### Minor Enhancements From 91e00b20822842c80f2db06ab24dce63498845ae Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Wed, 26 Oct 2022 23:25:48 +0530 Subject: [PATCH 131/290] Release :gem: v4.3.1 --- History.markdown | 2 +- docs/_config.yml | 2 +- docs/_docs/history.md | 14 ++++++++++++++ docs/latest_version.txt | 2 +- lib/jekyll/version.rb | 2 +- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/History.markdown b/History.markdown index 365eec6f996..0f660a7d294 100644 --- a/History.markdown +++ b/History.markdown @@ -1,4 +1,4 @@ -## HEAD +## 4.3.1 / 2022-10-26 ### Bug Fixes diff --git a/docs/_config.yml b/docs/_config.yml index bbc80d2b072..74a9914eb56 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,5 +1,5 @@ --- -version: 4.3.0 +version: 4.3.1 name: Jekyll • Simple, blog-aware, static sites description: Transform your plain text into static websites and blogs url: https://jekyllrb.com diff --git a/docs/_docs/history.md b/docs/_docs/history.md index 93c3b781819..1700c17bc37 100644 --- a/docs/_docs/history.md +++ b/docs/_docs/history.md @@ -4,6 +4,20 @@ permalink: "/docs/history/" note: This file is autogenerated. Edit /History.markdown instead. --- +## 4.3.1 / 2022-10-26 +{: #v4-3-1} + +### Bug Fixes +{: #bug-fixes-v4-3-1} + +- Respect user-defined name attribute in documents ([#9167]({{ site.repository }}/issues/9167)) +- Revert "Incrementally rebuild when a data file is changed" ([#9170]({{ site.repository }}/issues/9170)) + +### Documentation + +- Release post for v4.3.1 ([#9171]({{ site.repository }}/issues/9171)) + + ## 4.3.0 / 2022-10-20 {: #v4-3-0} diff --git a/docs/latest_version.txt b/docs/latest_version.txt index 80895903a15..f77856a6f1a 100644 --- a/docs/latest_version.txt +++ b/docs/latest_version.txt @@ -1 +1 @@ -4.3.0 +4.3.1 diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index 246f7d748cf..525f4c6fe8f 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Jekyll - VERSION = "4.3.0" + VERSION = "4.3.1" end From 94028e7f4c572f17fe8693f20cd16daa229278e8 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 27 Oct 2022 20:22:52 +0530 Subject: [PATCH 132/290] Remove noise in `features/highlighting.feature` --- features/highlighting.feature | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/features/highlighting.feature b/features/highlighting.feature index c9f2b00acec..9a547b532dc 100644 --- a/features/highlighting.feature +++ b/features/highlighting.feature @@ -4,29 +4,14 @@ Feature: Syntax Highlighting And make them pretty for all the world to see Scenario: highlighting an apache configuration - Given I have an "index.html" file with content: + Given I have an "index.html" page with content: """ - --- - --- - {% highlight apache %} RewriteEngine On RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteRule ^(.*)$ index.php [QSA,L] {% endhighlight %} - - ```apache - RewriteEngine On - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteRule ^(.*)$ index.php [QSA,L] - ``` - """ - And I have a "_config.yml" file with content: - """ - kramdown: - input: GFM """ When I run jekyll build Then I should get a zero exit-status From 99cfe52cd851ccf4485db86fb873d143af47a758 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Wed, 2 Nov 2022 14:45:10 +0530 Subject: [PATCH 133/290] Bump RuboCop to `v1.38.x` Closes #9173 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index e6ad84f3466..50a4a6b6e67 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ group :test do gem "nokogiri", "~> 1.7" gem "rspec" gem "rspec-mocks" - gem "rubocop", "~> 1.37.0" + gem "rubocop", "~> 1.38.0" gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rake" From 7558ecb1f7c4d5c078783f39befdbe544b5cfece Mon Sep 17 00:00:00 2001 From: Olly Headey Date: Thu, 3 Nov 2022 14:40:54 +0000 Subject: [PATCH 134/290] Allow marking specific highlighted lines via Liquid (#9138) Merge pull request 9138 --- .github/actions/spelling/patterns.txt | 3 ++ docs/_docs/liquid/tags.md | 19 ++++++++++++ features/highlighting.feature | 27 +++++++++++++++++ lib/jekyll/tags/highlight.rb | 43 ++++++++++++++++++++------- 4 files changed, 81 insertions(+), 11 deletions(-) diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt index 341825df898..91e276a4f2d 100644 --- a/.github/actions/spelling/patterns.txt +++ b/.github/actions/spelling/patterns.txt @@ -73,3 +73,6 @@ apiKey: '[a-f0-9]+' # ignore long runs of a single character: \b([A-Za-z])\g{-1}{3,}\b + +# ignore inline code +`\w+` diff --git a/docs/_docs/liquid/tags.md b/docs/_docs/liquid/tags.md index 0e134fe5067..ebc7a815a05 100644 --- a/docs/_docs/liquid/tags.md +++ b/docs/_docs/liquid/tags.md @@ -66,6 +66,25 @@ end ``` {% endraw %} +### Marking specific lines + +You can mark specific lines in a code snippet by using the optional +argument `mark_lines`. This argument takes a space-separated list of +line numbers which must be wrapped in double quotes. For example, the +following code block will mark lines 1 and 2 but not line 3: + +{% raw %} +```liquid +{% highlight ruby mark_lines="1 2" %} +def foo + puts 'foo' +end +{% endhighlight %} +``` +{% endraw %} + +A default class name of `hll` will be applied to the marked lines. + ### Stylesheets for syntax highlighting In order for the highlighting to show up, you’ll need to include a highlighting diff --git a/features/highlighting.feature b/features/highlighting.feature index 9a547b532dc..28d168c0a24 100644 --- a/features/highlighting.feature +++ b/features/highlighting.feature @@ -16,3 +16,30 @@ Feature: Syntax Highlighting When I run jekyll build Then I should get a zero exit-status And I should see "RewriteCond" in "_site/index.html" + + Scenario: marking lines 1 and 2 in a Ruby code block with valid syntax + Given I have an "index.html" page with content: + """ + {% highlight ruby mark_lines="1 2" %} + module Jekyll + module Tags + class HighlightBlock < Liquid::Block + {% endhighlight %} + """ + When I run jekyll build + Then I should get a zero exit-status + And I should see "module Jekyll" in "_site/index.html" + And I should see " module Tags" in "_site/index.html" + And I should see "class HighlightBlock [linenos] + Valid syntax: highlight [linenos] [mark_lines="3 4 5"] + + See https://jekyllrb.com/docs/liquid/tags/#code-snippet-highlighting for more details. MSG end end @@ -81,20 +83,39 @@ def render_pygments(code, _context) def render_rouge(code) require "rouge" formatter = ::Rouge::Formatters::HTML.new - if @highlight_options[:linenos] - formatter = ::Rouge::Formatters::HTMLTable.new( - formatter, - { - :css_class => "highlight", - :gutter_class => "gutter", - :code_class => "code", - } - ) - end + formatter = line_highlighter_formatter(formatter) if @highlight_options[:mark_lines] + formatter = table_formatter(formatter) if @highlight_options[:linenos] + lexer = ::Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText formatter.format(lexer.lex(code)) end + def line_highlighter_formatter(formatter) + ::Rouge::Formatters::HTMLLineHighlighter.new( + formatter, + :highlight_lines => mark_lines + ) + end + + def mark_lines + value = @highlight_options[:mark_lines] + return value.map(&:to_i) if value.is_a?(Array) + + raise SyntaxError, "Syntax Error for mark_lines declaration. Expected a " \ + "double-quoted list of integers." + end + + def table_formatter(formatter) + ::Rouge::Formatters::HTMLTable.new( + formatter, + { + :css_class => "highlight", + :gutter_class => "gutter", + :code_class => "code", + } + ) + end + def render_codehighlighter(code) h(code).strip end From 48977ec304ee5963b08c2379b66f9faadbf2523d Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 3 Nov 2022 07:40:56 -0700 Subject: [PATCH 135/290] Update history to reflect merge of #9138 [ci skip] --- History.markdown | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/History.markdown b/History.markdown index 0f660a7d294..05452a40735 100644 --- a/History.markdown +++ b/History.markdown @@ -1,3 +1,9 @@ +## HEAD + +### Minor Enhancements + + * Allow marking specific highlighted lines via Liquid (#9138) + ## 4.3.1 / 2022-10-26 ### Bug Fixes From 645584824f64c8531c533205c54f56f018f510f2 Mon Sep 17 00:00:00 2001 From: Robert Love Date: Fri, 4 Nov 2022 01:51:34 +1100 Subject: [PATCH 136/290] Fix Nested tree navigation with recursion example (#9174) Merge pull request 9174 --- docs/_tutorials/navigation.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/_tutorials/navigation.md b/docs/_tutorials/navigation.md index 5b7cbb393be..5375532cede 100644 --- a/docs/_tutorials/navigation.md +++ b/docs/_tutorials/navigation.md @@ -637,11 +637,11 @@ First, we'll create an include that we can use for rendering the navigation tree ```liquid
    {% for item in include.nav %} -
  • {{ item.title }}
    • - - {% if item.subnav %} - {% include nav.html nav=item.subnav %} - {% endif %} +
  • {{ item.title }} + {% if item.subnav %} + {% include nav.html nav=item.subnav %} + {% endif %} +
    • {% endfor %}
``` From 4c42559a518b5a80a565d95d50fc812b5181ff6b Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 3 Nov 2022 07:51:36 -0700 Subject: [PATCH 137/290] Update history to reflect merge of #9174 [ci skip] --- History.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.markdown b/History.markdown index 05452a40735..8b141ef7453 100644 --- a/History.markdown +++ b/History.markdown @@ -4,6 +4,10 @@ * Allow marking specific highlighted lines via Liquid (#9138) +### Documentation + + * Fix Nested tree navigation with recursion example (#9174) + ## 4.3.1 / 2022-10-26 ### Bug Fixes From f40e5cff5f48a424e6f8636a48f5a20c3b1d9447 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Mon, 7 Nov 2022 12:24:19 +0530 Subject: [PATCH 138/290] Cleanup highlight tag (#9177) Merge pull request 9177 --- lib/jekyll/tags/highlight.rb | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb index 321a49f849a..fcea81ff41a 100644 --- a/lib/jekyll/tags/highlight.rb +++ b/lib/jekyll/tags/highlight.rb @@ -82,16 +82,16 @@ def render_pygments(code, _context) def render_rouge(code) require "rouge" - formatter = ::Rouge::Formatters::HTML.new + formatter = Rouge::Formatters::HTML.new formatter = line_highlighter_formatter(formatter) if @highlight_options[:mark_lines] formatter = table_formatter(formatter) if @highlight_options[:linenos] - lexer = ::Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText + lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText formatter.format(lexer.lex(code)) end def line_highlighter_formatter(formatter) - ::Rouge::Formatters::HTMLLineHighlighter.new( + Rouge::Formatters::HTMLLineHighlighter.new( formatter, :highlight_lines => mark_lines ) @@ -106,13 +106,11 @@ def mark_lines end def table_formatter(formatter) - ::Rouge::Formatters::HTMLTable.new( + Rouge::Formatters::HTMLTable.new( formatter, - { - :css_class => "highlight", - :gutter_class => "gutter", - :code_class => "code", - } + :css_class => "highlight", + :gutter_class => "gutter", + :code_class => "code" ) end @@ -121,12 +119,8 @@ def render_codehighlighter(code) end def add_code_tag(code) - code_attributes = [ - "class=\"language-#{@lang.to_s.tr("+", "-")}\"", - "data-lang=\"#{@lang}\"", - ].join(" ") - "
" \
-          "#{code.chomp}
" + code_attrs = %(class="language-#{@lang.tr("+", "-")}" data-lang="#{@lang}") + %(
#{code.chomp}
) end end end From 9301d53ca9fb1a6ba7adc5fb3b5eae4475668f2e Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 6 Nov 2022 22:54:21 -0800 Subject: [PATCH 139/290] Update history to reflect merge of #9177 [ci skip] --- History.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.markdown b/History.markdown index 8b141ef7453..23ccfc5d445 100644 --- a/History.markdown +++ b/History.markdown @@ -8,6 +8,10 @@ * Fix Nested tree navigation with recursion example (#9174) +### Development Fixes + + * Cleanup highlight tag (#9177) + ## 4.3.1 / 2022-10-26 ### Bug Fixes From 28a475a66005a9b69f4e8d429b81f6068b7db6b0 Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Mon, 7 Nov 2022 09:19:10 +0200 Subject: [PATCH 140/290] Run tests in UTC timezone (#9168) Merge pull request 9168 --- script/test | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script/test b/script/test index 09f7eaa66c4..d3c65b14e17 100755 --- a/script/test +++ b/script/test @@ -34,6 +34,8 @@ else rubies=($(script/rubies)) fi +# Tests only pass when timezone offset is zero. +TZ=UTC for ruby in $rubies; do if [[ "$ruby" == "jruby" ]] From 66fe8b5f2192ae2c285453cefc0d8ab09a9c5839 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 6 Nov 2022 23:19:12 -0800 Subject: [PATCH 141/290] Update history to reflect merge of #9168 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 23ccfc5d445..7482106eff0 100644 --- a/History.markdown +++ b/History.markdown @@ -11,6 +11,7 @@ ### Development Fixes * Cleanup highlight tag (#9177) + * Run tests in utc (#9168) ## 4.3.1 / 2022-10-26 From 581717cc41e6b4f6b9b072ce6ebae929d108229f Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Mon, 7 Nov 2022 18:45:33 +0530 Subject: [PATCH 142/290] Fix ordered-list style in articles on mobiles --- docs/_sass/_style.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss index b97a8cbc99f..26572151572 100644 --- a/docs/_sass/_style.scss +++ b/docs/_sass/_style.scss @@ -444,7 +444,9 @@ article { } @media (max-width: 480px) { - article ul { padding-left: 20px; } + article { + ul, ol { padding-left: 20px } + } } @media (max-width: 568px) { From 3fded46fa902e7153c3ba1f5d0cd14bea1423df7 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sun, 27 Nov 2022 21:51:30 +0530 Subject: [PATCH 143/290] Lock Ruby in CI to v3.1.2 and bump JRuby to v9.4.0.0 (#9196) Merge pull request 9196 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad8547e39fd..db9e53d8a8d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,10 +22,10 @@ jobs: ruby_version: "2.7" - label: Ruby 3.0 ruby_version: "3.0" - - label: Ruby 3.1 - ruby_version: "3.1" - - label: JRuby 9.3.4.0 - ruby_version: "jruby-9.3.4.0" + - label: Ruby 3.1.2 + ruby_version: "3.1.2" + - label: JRuby 9.4.0.0 + ruby_version: "jruby-9.4.0.0" steps: - name: Checkout Repository uses: actions/checkout@v3 From ee29b05e80279929a23262053de13d591d70952a Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 27 Nov 2022 08:21:31 -0800 Subject: [PATCH 144/290] Update history to reflect merge of #9196 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 7482106eff0..112bb30cca1 100644 --- a/History.markdown +++ b/History.markdown @@ -12,6 +12,7 @@ * Cleanup highlight tag (#9177) * Run tests in utc (#9168) + * Lock Ruby in CI to v3.1.2 and bump JRuby to v9.4.0.0 (#9196) ## 4.3.1 / 2022-10-26 From 0cf8533f61e43664c788ec483a1c853771081d47 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sun, 27 Nov 2022 22:59:34 +0530 Subject: [PATCH 145/290] Optimize default front matter using `File.fnmatch?` (#9185) Merge pull request 9185 --- lib/jekyll/frontmatter_defaults.rb | 2 +- .../gathering/_staff/admins/backend/gamma.svg | 1 + .../gathering/_staff/admins/backend/jack.md | 3 ++ .../_staff/admins/frontend/alpha.svg | 1 + .../gathering/_staff/admins/frontend/john.md | 3 ++ test/test_front_matter_defaults.rb | 37 ++++++++++++++++--- 6 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 test/source/gathering/_staff/admins/backend/gamma.svg create mode 100644 test/source/gathering/_staff/admins/backend/jack.md create mode 100644 test/source/gathering/_staff/admins/frontend/alpha.svg create mode 100644 test/source/gathering/_staff/admins/frontend/john.md diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb index 5ad896b287c..fb024fa9d52 100644 --- a/lib/jekyll/frontmatter_defaults.rb +++ b/lib/jekyll/frontmatter_defaults.rb @@ -109,7 +109,7 @@ def applies_path?(scope, path) sanitized_path = sanitize_path(path) if rel_scope_path.include?("*") - glob_scope(sanitized_path, rel_scope_path) + File.fnmatch?(strip_collections_dir(rel_scope_path), sanitized_path) else path_is_subpath?(sanitized_path, strip_collections_dir(rel_scope_path)) end diff --git a/test/source/gathering/_staff/admins/backend/gamma.svg b/test/source/gathering/_staff/admins/backend/gamma.svg new file mode 100644 index 00000000000..861641a7ff3 --- /dev/null +++ b/test/source/gathering/_staff/admins/backend/gamma.svg @@ -0,0 +1 @@ + diff --git a/test/source/gathering/_staff/admins/backend/jack.md b/test/source/gathering/_staff/admins/backend/jack.md new file mode 100644 index 00000000000..d6e5c2a9b91 --- /dev/null +++ b/test/source/gathering/_staff/admins/backend/jack.md @@ -0,0 +1,3 @@ +--- +speciality: Ruby +--- diff --git a/test/source/gathering/_staff/admins/frontend/alpha.svg b/test/source/gathering/_staff/admins/frontend/alpha.svg new file mode 100644 index 00000000000..861641a7ff3 --- /dev/null +++ b/test/source/gathering/_staff/admins/frontend/alpha.svg @@ -0,0 +1 @@ + diff --git a/test/source/gathering/_staff/admins/frontend/john.md b/test/source/gathering/_staff/admins/frontend/john.md new file mode 100644 index 00000000000..cff8a6a4c77 --- /dev/null +++ b/test/source/gathering/_staff/admins/frontend/john.md @@ -0,0 +1,3 @@ +--- +speciality: JS Frameworks +--- diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb index 9b7f1b68833..32180aae8bc 100644 --- a/test/test_front_matter_defaults.rb +++ b/test/test_front_matter_defaults.rb @@ -25,10 +25,6 @@ class TestFrontMatterDefaults < JekyllUnitTest assert_equal "val", @affected.data["key"] assert_nil @not_affected.data["key"] end - - should "not call Dir.glob block" do - refute_includes @output, "Globbed Scope Path:" - end end context "A site with full front matter defaults (glob)" do @@ -53,9 +49,38 @@ class TestFrontMatterDefaults < JekyllUnitTest assert_equal "val", @affected.data["key"] assert_nil @not_affected.data["key"] end + end + + context "A site with collections and front matter defaults with glob patterns" do + setup do + site = fixture_site( + "collections_dir" => "gathering", + "collections" => { "staff" => { "output" => true } }, + "defaults" => [ + { + "scope" => { "path" => "_staff/**/*.md", "type" => "staff" }, + "values" => { "layout" => "simple" }, + }, + { + "scope" => { "path" => "_staff/**/*.svg" }, + "values" => { "css_class" => "epilson" }, + }, + ] + ) + site.read + @staff = site.collections["staff"] + end + + should "affect the appropriate items only" do + @staff.docs.each do |item| + assert_equal "simple", item.data["layout"] + assert_nil item.data["css_class"] + end - should "call Dir.glob block" do - assert_includes @output, "Globbed Scope Path:" + @staff.files.each do |item| + assert_equal "epilson", item.data["css_class"] + assert_nil item.data["layout"] + end end end From bf67f086c4b23f2a35f1aff4244b26c81fef25c0 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 27 Nov 2022 09:29:36 -0800 Subject: [PATCH 146/290] Update history to reflect merge of #9185 [ci skip] --- History.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.markdown b/History.markdown index 112bb30cca1..720e69d7806 100644 --- a/History.markdown +++ b/History.markdown @@ -14,6 +14,10 @@ * Run tests in utc (#9168) * Lock Ruby in CI to v3.1.2 and bump JRuby to v9.4.0.0 (#9196) +### Bug Fixes + + * Optimize default front matter using `File.fnmatch?` (#9185) + ## 4.3.1 / 2022-10-26 ### Bug Fixes From 072808d9536ec55a758b70bfe33a7e27b4ed37bb Mon Sep 17 00:00:00 2001 From: Valeriy Van Date: Sun, 4 Dec 2022 12:48:41 +0200 Subject: [PATCH 147/290] Fix typo (#9203) Merge pull request 9203 --- docs/_docs/step-by-step/10-deployment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_docs/step-by-step/10-deployment.md b/docs/_docs/step-by-step/10-deployment.md index 8071b8a9840..54b798a50ba 100644 --- a/docs/_docs/step-by-step/10-deployment.md +++ b/docs/_docs/step-by-step/10-deployment.md @@ -45,7 +45,7 @@ This restricts your Ruby environment to only use gems set in your `Gemfile`. ## Plugins Jekyll plugins allow you to create custom generated content specific to your -site. There's many [plugins](/docs/plugins/) available or you can even +site. There're many [plugins](/docs/plugins/) available or you can even write your own. There are three official plugins which are useful on almost any Jekyll site: From d78c65f2c7edb6c9b864a0095f81c12d5e075ae6 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 4 Dec 2022 02:48:43 -0800 Subject: [PATCH 148/290] Update history to reflect merge of #9203 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 720e69d7806..5ad21174a1f 100644 --- a/History.markdown +++ b/History.markdown @@ -7,6 +7,7 @@ ### Documentation * Fix Nested tree navigation with recursion example (#9174) + * Fix typo on website (#9203) ### Development Fixes From 82bb2714df846b9126b1ad9b9a447cb3dc733bee Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sun, 18 Dec 2022 18:44:02 +0530 Subject: [PATCH 149/290] Remove totals in profile table properly (#9186) Merge pull request 9186 --- lib/jekyll/liquid_renderer/table.rb | 12 +----------- lib/jekyll/profiler.rb | 4 ---- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/lib/jekyll/liquid_renderer/table.rb b/lib/jekyll/liquid_renderer/table.rb index b354b15d379..2d06a26a76a 100644 --- a/lib/jekyll/liquid_renderer/table.rb +++ b/lib/jekyll/liquid_renderer/table.rb @@ -15,16 +15,12 @@ def to_s(num_of_rows = 50) private - # rubocop:disable Metrics/AbcSize def data_for_table(num_of_rows) sorted = @stats.sort_by { |_, file_stats| -file_stats[:time] } sorted = sorted.slice(0, num_of_rows) table = [header_labels] - totals = Hash.new { |hash, key| hash[key] = 0 } - sorted.each do |filename, file_stats| - GAUGES.each { |gauge| totals[gauge] += file_stats[gauge] } row = [] row << filename row << file_stats[:count].to_s @@ -33,14 +29,8 @@ def data_for_table(num_of_rows) table << row end - footer = [] - footer << "TOTAL (for #{sorted.size} files)" - footer << totals[:count].to_s - footer << format_bytes(totals[:bytes]) - footer << format("%.3f", totals[:time]) - table << footer + table end - # rubocop:enable Metrics/AbcSize def header_labels GAUGES.map { |gauge| gauge.to_s.capitalize }.unshift("Filename") diff --git a/lib/jekyll/profiler.rb b/lib/jekyll/profiler.rb index 9dd879f1d38..f5dbfb18e7e 100644 --- a/lib/jekyll/profiler.rb +++ b/lib/jekyll/profiler.rb @@ -33,18 +33,14 @@ def initialize(site) def profile_process profile_data = { "PHASE" => "TIME" } - total_time = 0 [:reset, :read, :generate, :render, :cleanup, :write].each do |method| start_time = Time.now @site.send(method) end_time = (Time.now - start_time).round(4) profile_data[method.to_s.upcase] = format("%.4f", end_time) - total_time += end_time end - profile_data["TOTAL TIME"] = format("%.4f", total_time) - Jekyll.logger.info "\nBuild Process Summary:" Jekyll.logger.info Profiler.tabulate(Array(profile_data)) From 80fc7729ad8665f8dadb5e3e1a88adb544983075 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 18 Dec 2022 05:14:04 -0800 Subject: [PATCH 150/290] Update history to reflect merge of #9186 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 5ad21174a1f..2d101a4cc67 100644 --- a/History.markdown +++ b/History.markdown @@ -18,6 +18,7 @@ ### Bug Fixes * Optimize default front matter using `File.fnmatch?` (#9185) + * Remove totals in profile table properly (#9186) ## 4.3.1 / 2022-10-26 From b2891a476e1f6a6cfccda7772fb4f5f2f7d166c5 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sun, 18 Dec 2022 18:50:27 +0530 Subject: [PATCH 151/290] Optimize `Site#each_site_file` (#9187) Merge pull request 9187 --- lib/jekyll/site.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index d6c5a0b88e6..9ef08c32438 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -360,15 +360,9 @@ def documents end def each_site_file - seen_files = [] - %w(pages static_files_to_write docs_to_write).each do |type| - send(type).each do |item| - next if seen_files.include?(item) - - yield item - seen_files << item - end - end + pages.each { |page| yield page } + static_files.each { |file| yield(file) if file.write? } + collections.each_value { |coll| coll.docs.each { |doc| yield(doc) if doc.write? } } end # Returns the FrontmatterDefaults or creates a new FrontmatterDefaults From 4c1ab7f182a1eb4c581f6ed4e5cdbc703290c162 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 18 Dec 2022 05:20:28 -0800 Subject: [PATCH 152/290] Update history to reflect merge of #9187 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 2d101a4cc67..d0ea4e58de4 100644 --- a/History.markdown +++ b/History.markdown @@ -19,6 +19,7 @@ * Optimize default front matter using `File.fnmatch?` (#9185) * Remove totals in profile table properly (#9186) + * Optimize `Site#each_site_file` (#9187) ## 4.3.1 / 2022-10-26 From f1a20d0e22072fa29f4a4ce219d0950ef0e26d2f Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sun, 18 Dec 2022 18:59:35 +0530 Subject: [PATCH 153/290] Reword `there're` to `there are` --- docs/_docs/step-by-step/10-deployment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_docs/step-by-step/10-deployment.md b/docs/_docs/step-by-step/10-deployment.md index 54b798a50ba..276598197bb 100644 --- a/docs/_docs/step-by-step/10-deployment.md +++ b/docs/_docs/step-by-step/10-deployment.md @@ -45,7 +45,7 @@ This restricts your Ruby environment to only use gems set in your `Gemfile`. ## Plugins Jekyll plugins allow you to create custom generated content specific to your -site. There're many [plugins](/docs/plugins/) available or you can even +site. There are many [plugins](/docs/plugins/) available or you can even write your own. There are three official plugins which are useful on almost any Jekyll site: From 300668ed7fe229f9ef7e448a2d05ba5d165e2a22 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sun, 18 Dec 2022 19:15:34 +0530 Subject: [PATCH 154/290] Lock `psych` to v4.x Psych 5 has stopped bundling `libyaml` and expects it to be installed on the host system prior to being invoked. Since we don't have a direct dependency on the Psych gem (it gets included in the gem bundle as a dependency of the `rdoc` gem), lock psych gem to v4.x instead of installing `libyaml` in our development / CI environment. --- Gemfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Gemfile b/Gemfile index 50a4a6b6e67..0593306c247 100644 --- a/Gemfile +++ b/Gemfile @@ -75,6 +75,12 @@ group :jekyll_optional_dependencies do gem "kramdown-syntax-coderay" gem "matrix" gem "mime-types", "~> 3.0" + # Psych 5 has stopped bundling `libyaml` and expects it to be installed on the host system prior + # to being invoked. + # Since we don't have a direct dependency on the Psych gem (it gets included in the gem bundle as + # a dependency of the `rdoc` gem), lock psych gem to v4.x instead of installing `libyaml` in our + # development / CI environment. + gem "psych", "~> 4.0" gem "rdoc", "~> 6.0" gem "tomlrb" From fc75f5360d2d61122905f0eab54d21b16cbfdab4 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sun, 18 Dec 2022 22:03:51 +0530 Subject: [PATCH 155/290] Stop testing with Rubies older than 2.7 on Windows --- appveyor.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index af31dd5b885..8c0d372d2e0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,7 @@ version: "{build}" +image: Visual Studio 2019 + clone_depth: 5 branches: @@ -13,22 +15,22 @@ build: off environment: BUNDLE_WITHOUT: "benchmark:development" matrix: - - RUBY_FOLDER_VER: "26" + - RUBY_FOLDER_VER: "27" TZINFO_VERSION: "~> 1.2" TEST_SUITE: "test" - - RUBY_FOLDER_VER: "26" + - RUBY_FOLDER_VER: "27" TZINFO_VERSION: "~> 2.0" TEST_SUITE: "test" - - RUBY_FOLDER_VER: "26" + - RUBY_FOLDER_VER: "27" TEST_SUITE: "default-site" - - RUBY_FOLDER_VER: "26" + - RUBY_FOLDER_VER: "27" TEST_SUITE: "profile-docs" - - RUBY_FOLDER_VER: "26" + - RUBY_FOLDER_VER: "27" TEST_SUITE: "memprof" - - RUBY_FOLDER_VER: "26" + - RUBY_FOLDER_VER: "27" TZINFO_VERSION: "~> 1.2" TEST_SUITE: "cucumber" - - RUBY_FOLDER_VER: "26" + - RUBY_FOLDER_VER: "27" TZINFO_VERSION: "~> 2.0" TEST_SUITE: "cucumber" From 572c86ec130f62722332f85051a8eef5f15deb7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= Date: Thu, 22 Dec 2022 06:51:02 -0800 Subject: [PATCH 156/290] Update sass related tests for jekyll-sass-converter 3.x (#9223) Merge pull request 9223 --- features/rendering.feature | 2 +- features/theme.feature | 4 ++-- test/test_filters.rb | 4 ++-- test/test_sass.rb | 4 +++- test/test_theme_assets_reader.rb | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/features/rendering.feature b/features/rendering.feature index 2b504a07555..c06e06524f5 100644 --- a/features/rendering.feature +++ b/features/rendering.feature @@ -168,7 +168,7 @@ Feature: Rendering When I run jekyll build Then I should get a zero exit status And the _site directory should exist - And I should see ".foo-bar { color: red; }\n\n\/\*# sourceMappingURL=index.css.map \*\/" in "_site/index.css" + And I should see ".foo-bar {\n color: red;\n}\n\n\/\*# sourceMappingURL=index.css.map \*\/" in "_site/index.css" Scenario: Not render liquid in CoffeeScript without explicitly including jekyll-coffeescript Given I have an "index.coffee" page with animal "cicada" that contains "hey='for {{page.animal}}'" diff --git a/features/theme.feature b/features/theme.feature index 75ff5c69cb3..ec63b21271d 100644 --- a/features/theme.feature +++ b/features/theme.feature @@ -19,7 +19,7 @@ Feature: Writing themes When I run jekyll build Then I should get a zero exit status And the _site directory should exist - And I should see ".sample { color: red; }\n\n\/\*# sourceMappingURL=style.css.map \*\/" in "_site/assets/style.css" + And I should see ".sample {\n color: red;\n}\n\n\/\*# sourceMappingURL=style.css.map \*\/" in "_site/assets/style.css" Scenario: Overriding a theme with SCSS Given I have a configuration file with "theme" set to "test-theme" @@ -28,7 +28,7 @@ Feature: Writing themes When I run jekyll build Then I should get a zero exit status And the _site directory should exist - And I should see ".sample { color: black; }\n\n\/\*# sourceMappingURL=style.css.map \*\/" in "_site/assets/style.css" + And I should see ".sample {\n color: black;\n}\n\n\/\*# sourceMappingURL=style.css.map \*\/" in "_site/assets/style.css" Scenario: A theme with an include Given I have a configuration file with "theme" set to "test-theme" diff --git a/test/test_filters.rb b/test/test_filters.rb index 176e5ed6d49..ea82fc5b5e3 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -143,7 +143,7 @@ def select; end should "sassify with simple string" do assert_equal( - "p { color: #123456; }\n", + "p {\n color: #123456;\n}", @filter.sassify(<<~SASS) $blue: #123456 p @@ -154,7 +154,7 @@ def select; end should "scssify with simple string" do assert_equal( - "p { color: #123456; }\n", + "p {\n color: #123456;\n}", @filter.scssify("$blue:#123456; p{color: $blue}") ) end diff --git a/test/test_sass.rb b/test/test_sass.rb index 372cdedbbf8..3d930d00ad7 100644 --- a/test/test_sass.rb +++ b/test/test_sass.rb @@ -15,7 +15,9 @@ class TestSass < JekyllUnitTest should "import SCSS partial" do result = <<~CSS - .half { width: 50%; } + .half { + width: 50%; + } /*# sourceMappingURL=main.css.map */ CSS diff --git a/test/test_theme_assets_reader.rb b/test/test_theme_assets_reader.rb index f45503e7dbb..635cec35618 100644 --- a/test/test_theme_assets_reader.rb +++ b/test/test_theme_assets_reader.rb @@ -38,7 +38,7 @@ def refute_file_with_relative_path(haystack, relative_path) file = @site.pages.find { |f| f.relative_path == "assets/style.scss" } refute_nil file assert_equal @site.in_dest_dir("assets/style.css"), file.destination(@site.dest) - assert_includes file.output, ".sample { color: black; }" + assert_includes file.output, ".sample {\n color: black;\n}" end should "not overwrite site content with the same relative path" do From 548b9e93721784cb1a3823855cdb57fec183bb82 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 22 Dec 2022 06:51:04 -0800 Subject: [PATCH 157/290] Update history to reflect merge of #9223 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index d0ea4e58de4..1b61a8c4dd8 100644 --- a/History.markdown +++ b/History.markdown @@ -14,6 +14,7 @@ * Cleanup highlight tag (#9177) * Run tests in utc (#9168) * Lock Ruby in CI to v3.1.2 and bump JRuby to v9.4.0.0 (#9196) + * Update sass related tests for jekyll-sass-converter 3.x (#9223) ### Bug Fixes From 69839ba6dca577ff5e41dc0ffb570a396bf7c057 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Fri, 23 Dec 2022 11:50:07 +0530 Subject: [PATCH 158/290] Publish post on major release of sass-converter (#9225) Merge pull request 9225 --- ...ekyll-sass-converter-3.0-released.markdown | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 docs/_posts/2022-12-21-jekyll-sass-converter-3.0-released.markdown diff --git a/docs/_posts/2022-12-21-jekyll-sass-converter-3.0-released.markdown b/docs/_posts/2022-12-21-jekyll-sass-converter-3.0-released.markdown new file mode 100644 index 00000000000..d49fdd07f72 --- /dev/null +++ b/docs/_posts/2022-12-21-jekyll-sass-converter-3.0-released.markdown @@ -0,0 +1,71 @@ +--- +title: Jekyll Sass Converter 3.0 Released +date: 2022-12-21 17:52:15 +0530 +author: ashmaroli +category: community +--- + +Jekyll Sass Converter 3.0 shipped recently and is available to those using Jekyll 4.3 and above. This release contains major changes. +Specifically, the plugin has **stopped using `sassc` for converting your Sass partials and stylesheets** into CSS files. +Instead, the converter now uses the `sass-embedded` gem acting as an interface to Dart Sass, which is the current primary +implementation of Sass under active development. The secondary implementation `libsass` which the `sassc` gem interfaced +with has been deprecated by its developers. + +However, Dart Sass isn't *fully compatible* with older Ruby Sass workflow. + +## Requirements + +- Minimum Ruby Version: `Ruby 2.6.0` (all platforms). +- Minimum Rubygems Version: `3.3.22` (for Linux-based platforms). + +## Migration Guide + +### Dropped `implmentation` Option + +In `v3.0.x`, `sass-embedded` is the only supported Sass implmentation, and therefore the config option +`sass.implementation` introduced in `v2.2.0` has been removed. + + +### Dropped `add_charset` Option + +The converter will no longer emit `@charset "UTF-8";` or a `U+FEFF` (byte-order marker) for `sassify` and `scssify` +Jekyll filters and hence the redundant option `sass.add_charset` is no longer active. + + +### Dropped `line_comments` Option + +`sass-embedded` does not support `sass.line_comments` option. + + +### Dropped support of importing files with non-standard extension names + +`sass-embedded` only allows importing files that have extension names of `.sass`, `.scss` or `.css`. SCSS syntax in +files with `.css` extension name will result in a syntax error. + + +### Dropped support of importing files relative to site source + +In `v2.x`, the Converter allowed imports using paths relative to site source directory, even if the site source +directory is not present in Sass' `load_paths` option. This is a side effect of a bug in the converter, which will remain as is in +`v2.x` due to its usage in the wild. + +In `v3.x`, imports using paths relative to site source directory will not work out of box. To allow these imports, `.` +(meaning current directory, or site source directory) need to be explicitly listed under `load_paths` option. + + +### Dropped support of importing files with the same filename as their parent file + +In `v2.x`, the Converter allowed imports of files with the same filename as their parent file from `sass_dir` or +`load_paths`. This is a side effect of a bug in the Converter, which will remain as is in `v2.x` due to its usage in the +wild. + +In `v3.x`, imports using the same filename of parent file will create a circular import. To fix such imports, rename +either of the files, or use complete relative path from the parent file. + + +### Behavioral Differences in Sass Implementation + +There are a few intentional behavioral differences between Dart Sass and Ruby Sass. Please refer +[Behavioral Differences from Ruby Sass][behavioral-differences] for details. + +[behavioral-differences]: https://github.com/sass/dart-sass#behavioral-differences-from-ruby-sass From dbaca2c107f2c6a28021c19029ede0a376f2fa9b Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 22 Dec 2022 22:20:09 -0800 Subject: [PATCH 159/290] Update history to reflect merge of #9225 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 1b61a8c4dd8..080320ae2bb 100644 --- a/History.markdown +++ b/History.markdown @@ -8,6 +8,7 @@ * Fix Nested tree navigation with recursion example (#9174) * Fix typo on website (#9203) + * Publish post on major release of sass-converter (#9225) ### Development Fixes From ee3576e2cbc8727cc21d6da5d0f662228f2c4f4c Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Mon, 26 Dec 2022 19:46:39 +0530 Subject: [PATCH 160/290] Split `test/test_tags.rb` into multiple files (#9230) Merge pull request 9230 --- test/helper.rb | 32 + test/test_tag_highlight.rb | 302 ++++++++ test/test_tag_include.rb | 310 ++++++++ test/test_tag_include_relative.rb | 126 +++ test/test_tag_link.rb | 206 +++++ test/test_tag_post_url.rb | 136 ++++ test/test_tags.rb | 1191 ----------------------------- 7 files changed, 1112 insertions(+), 1191 deletions(-) create mode 100644 test/test_tag_highlight.rb create mode 100644 test/test_tag_include.rb create mode 100644 test/test_tag_include_relative.rb create mode 100644 test/test_tag_link.rb create mode 100644 test/test_tag_post_url.rb delete mode 100644 test/test_tags.rb diff --git a/test/helper.rb b/test/helper.rb index 7b1a2b4b4f8..3ec9d75cbdf 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -262,3 +262,35 @@ def document_root_options ) end end + +class TagUnitTest < JekyllUnitTest + def render_content(content, override = {}) + base_config = { + "source" => source_dir, + "destination" => dest_dir, + } + site = fixture_site(base_config.merge(override)) + + if override["read_posts"] + site.posts.docs.concat(PostReader.new(site).read_posts("")) + elsif override["read_collections"] + CollectionReader.new(site).read + elsif override["read_all"] + site.read + end + + @result = render_with(site, content) + end + + private + + def render_with(site, content) + converter = site.converters.find { |c| c.instance_of?(Jekyll::Converters::Markdown) } + payload = { "highlighter_prefix" => converter.highlighter_prefix, + "highlighter_suffix" => converter.highlighter_suffix, } + info = { :registers => { :site => site } } + converter.convert( + Liquid::Template.parse(content).render!(payload, info) + ) + end +end diff --git a/test/test_tag_highlight.rb b/test/test_tag_highlight.rb new file mode 100644 index 00000000000..14a3bdee244 --- /dev/null +++ b/test/test_tag_highlight.rb @@ -0,0 +1,302 @@ +# frozen_string_literal: true + +require "helper" + +class TestTagHighlight < TagUnitTest + def render_content_with_text_to_highlight(code) + content = <<~CONTENT + --- + title: This is a test + --- + + This document has some highlighted code in it. + + {% highlight text %} + #{code} + {% endhighlight %} + + {% highlight text linenos %} + #{code} + {% endhighlight %} + CONTENT + render_content(content) + end + + # Syntax sugar for low-level version of: + # ``` + # {% highlight markup%}test{% endhighlight %} + # ``` + def highlight_block_with_markup(markup) + Jekyll::Tags::HighlightBlock.parse( + "highlight", + markup, + Liquid::Tokenizer.new("test{% endhighlight %}\n"), + Liquid::ParseContext.new + ) + end + + context "language name" do + should "match only the required set of chars" do + r = Jekyll::Tags::HighlightBlock::SYNTAX + [ + "ruby", + "c#", + "xml+cheetah", + "x.y", + "coffee-script", + "shell_session", + "ruby key=val", + "ruby a=b c=d", + ].each { |sample| assert_match(r, sample) } + + refute_match r, "blah^" + end + end + + context "highlight tag in unsafe mode" do + should "set the no options with just a language name" do + tag = highlight_block_with_markup("ruby ") + assert_equal({}, tag.instance_variable_get(:@highlight_options)) + end + + should "set the linenos option as 'inline' if no linenos value" do + tag = highlight_block_with_markup("ruby linenos ") + assert_equal( + { :linenos => "inline" }, + tag.instance_variable_get(:@highlight_options) + ) + end + + should "set the linenos option to 'table' " \ + "if the linenos key is given the table value" do + tag = highlight_block_with_markup("ruby linenos=table ") + assert_equal( + { :linenos => "table" }, + tag.instance_variable_get(:@highlight_options) + ) + end + + should "recognize nowrap option with linenos set" do + tag = highlight_block_with_markup("ruby linenos=table nowrap ") + assert_equal( + { :linenos => "table", :nowrap => true }, + tag.instance_variable_get(:@highlight_options) + ) + end + + should "recognize the cssclass option" do + tag = highlight_block_with_markup("ruby linenos=table cssclass=hl ") + assert_equal( + { :cssclass => "hl", :linenos => "table" }, + tag.instance_variable_get(:@highlight_options) + ) + end + + should "recognize the hl_linenos option and its value" do + tag = highlight_block_with_markup("ruby linenos=table cssclass=hl hl_linenos=3 ") + assert_equal( + { :cssclass => "hl", :linenos => "table", :hl_linenos => "3" }, + tag.instance_variable_get(:@highlight_options) + ) + end + + should "recognize multiple values of hl_linenos" do + tag = highlight_block_with_markup 'ruby linenos=table cssclass=hl hl_linenos="3 5 6" ' + assert_equal( + { :cssclass => "hl", :linenos => "table", :hl_linenos => %w(3 5 6) }, + tag.instance_variable_get(:@highlight_options) + ) + end + + should "treat language name as case insensitive" do + tag = highlight_block_with_markup("Ruby ") + assert_equal "ruby", tag.instance_variable_get(:@lang), "lexers should be case insensitive" + end + end + + context "with the rouge highlighter" do + context "post content has highlight tag" do + setup do + render_content_with_text_to_highlight "test" + end + + should "render markdown with rouge" do + assert_match( + %(
test
), + @result + ) + end + + should "render markdown with rouge with line numbers" do + assert_match( + %() + + %() + + %() + + %(
) + + %(
1\n
test\n
), + @result + ) + end + end + + context "post content has highlight with file reference" do + setup do + render_content_with_text_to_highlight "./jekyll.gemspec" + end + + should "not embed the file" do + assert_match( + '
' \
+          "./jekyll.gemspec
", + @result + ) + end + end + + context "post content has highlight tag with UTF character" do + setup do + render_content_with_text_to_highlight "Æ" + end + + should "render markdown with pygments line handling" do + assert_match( + '
Æ
', + @result + ) + end + end + + context "post content has highlight tag with preceding spaces & lines" do + setup do + render_content_with_text_to_highlight <<~EOS + + + [,1] [,2] + [1,] FALSE TRUE + [2,] FALSE TRUE + EOS + end + + should "only strip the preceding newlines" do + assert_match( + '
     [,1] [,2]',
+          @result
+        )
+      end
+    end
+
+    context "post content has highlight tag with preceding spaces & lines in several places" do
+      setup do
+        render_content_with_text_to_highlight <<~EOS
+
+
+               [,1] [,2]
+
+
+          [1,] FALSE TRUE
+          [2,] FALSE TRUE
+
+
+        EOS
+      end
+
+      should "only strip the newlines which precede and succeed the entire block" do
+        assert_match(
+          "
     [,1] [,2]\n\n\n" \
+          "[1,] FALSE TRUE\n[2,] FALSE TRUE
",
+          @result
+        )
+      end
+    end
+
+    context "post content has highlight tag with linenumbers" do
+      setup do
+        render_content <<~EOS
+          ---
+          title: This is a test
+          ---
+
+          This is not yet highlighted
+          {% highlight php linenos %}
+          test
+          {% endhighlight %}
+
+          This should not be highlighted, right?
+        EOS
+      end
+
+      should "should stop highlighting at boundary with rouge" do
+        expected = <<~EOS
+          
This is not yet highlighted

+
+          
1
+          
test
+          

+
+          
This should not be highlighted, right?

+        EOS
+        assert_match(expected, @result)
+      end
+    end
+
+    context "post content has highlight tag with " \
+            "preceding spaces & Windows-style newlines" do
+      setup do
+        render_content_with_text_to_highlight "\r\n\r\n\r\n     [,1] [,2]"
+      end
+
+      should "only strip the preceding newlines" do
+        assert_match(
+          '
     [,1] [,2]',
+          @result
+        )
+      end
+    end
+
+    context "post content has highlight tag with only preceding spaces" do
+      setup do
+        render_content_with_text_to_highlight <<~EOS
+               [,1] [,2]
+          [1,] FALSE TRUE
+          [2,] FALSE TRUE
+        EOS
+      end
+
+      should "only strip the preceding newlines" do
+        assert_match(
+          '
     [,1] [,2]',
+          @result
+        )
+      end
+    end
+  end
+
+  context "simple post with markdown and pre tags" do
+    setup do
+      @content = <<~CONTENT
+        ---
+        title: Kramdown post with pre
+        ---
+
+        _FIGHT!_
+
+        {% highlight ruby %}
+        puts "3..2..1.."
+        {% endhighlight %}
+
+        *FINISH HIM*
+      CONTENT
+    end
+
+    context "using Kramdown" do
+      setup do
+        render_content(@content, "markdown" => "kramdown")
+      end
+
+      should "parse correctly" do
+        assert_match %r{FIGHT!}, @result
+        assert_match %r!FINISH HIM!, @result
+      end
+    end
+  end
+end
diff --git a/test/test_tag_include.rb b/test/test_tag_include.rb
new file mode 100644
index 00000000000..59fbb17fc89
--- /dev/null
+++ b/test/test_tag_include.rb
@@ -0,0 +1,310 @@
+# frozen_string_literal: true
+
+require "helper"
+
+class TestTagInclude < TagUnitTest
+  context "include tag with parameters" do
+    context "with symlink'd include" do
+      should "not allow symlink includes" do
+        FileUtils.mkdir_p("tmp")
+        File.write("tmp/pages-test", "SYMLINK TEST")
+        assert_raises IOError do
+          content = <<~CONTENT
+            ---
+            title: Include symlink
+            ---
+
+            {% include tmp/pages-test %}
+
+          CONTENT
+          render_content(content, "safe" => true)
+        end
+        @result ||= ""
+        refute_match(%r!SYMLINK TEST!, @result)
+      end
+
+      should "not expose the existence of symlinked files" do
+        ex = assert_raises IOError do
+          content = <<~CONTENT
+            ---
+            title: Include symlink
+            ---
+
+            {% include tmp/pages-test-does-not-exist %}
+
+          CONTENT
+          render_content(content, "safe" => true)
+        end
+        assert_match(
+          "Could not locate the included file 'tmp/pages-test-does-not-exist' in any of " \
+          "[\"#{source_dir}/_includes\"]. Ensure it exists in one of those directories and is " \
+          "not a symlink as those are not allowed in safe mode.",
+          ex.message
+        )
+      end
+    end
+
+    context "with one parameter" do
+      setup do
+        content = <<~CONTENT
+          ---
+          title: Include tag parameters
+          ---
+
+          {% include sig.markdown myparam="test" %}
+
+          {% include params.html param="value" %}
+        CONTENT
+        render_content(content)
+      end
+
+      should "correctly output include variable" do
+        assert_match "value", @result.strip
+      end
+
+      should "ignore parameters if unused" do
+        assert_match "
\n
Tom Preston-Werner\ngithub.com/mojombo
\n", @result
+      end
+    end
+
+    context "with simple syntax but multiline markup" do
+      setup do
+        content = <<~CONTENT
+          ---
+          title: Include tag parameters
+          ---
+
+          {% include sig.markdown myparam="test" %}
+
+          {% include params.html
+            param="value" %}
+        CONTENT
+        render_content(content)
+      end
+
+      should "correctly output include variable" do
+        assert_match "value", @result.strip
+      end
+
+      should "ignore parameters if unused" do
+        assert_match "
\n
Tom Preston-Werner\ngithub.com/mojombo
\n", @result
+      end
+    end
+
+    context "with variable syntax but multiline markup" do
+      setup do
+        content = <<~CONTENT
+          ---
+          title: Include tag parameters
+          ---
+
+          {% include sig.markdown myparam="test" %}
+          {% assign path = "params" | append: ".html" %}
+          {% include {{ path }}
+            param="value" %}
+        CONTENT
+        render_content(content)
+      end
+
+      should "correctly output include variable" do
+        assert_match "value", @result.strip
+      end
+
+      should "ignore parameters if unused" do
+        assert_match "
\n
Tom Preston-Werner\ngithub.com/mojombo
\n", @result
+      end
+    end
+
+    context "with invalid parameter syntax" do
+      should "throw a ArgumentError" do
+        content = <<~CONTENT
+          ---
+          title: Invalid parameter syntax
+          ---
+
+          {% include params.html param s="value" %}
+        CONTENT
+        assert_raises ArgumentError, %(Did not raise exception on invalid "include" syntax) do
+          render_content(content)
+        end
+
+        content = <<~CONTENT
+          ---
+          title: Invalid parameter syntax
+          ---
+
+          {% include params.html params="value %}
+        CONTENT
+        assert_raises ArgumentError, %(Did not raise exception on invalid "include" syntax) do
+          render_content(content)
+        end
+      end
+    end
+
+    context "with several parameters" do
+      setup do
+        content = <<~CONTENT
+          ---
+          title: multiple include parameters
+          ---
+
+          {% include params.html param1="new_value" param2="another" %}
+        CONTENT
+        render_content(content)
+      end
+
+      should "list all parameters" do
+        assert_match "
  • param1 = new_value
    • ", @result
+        assert_match "
  • param2 = another
    • ", @result
+      end
+
+      should "not include previously used parameters" do
+        assert_match "", @result
+      end
+    end
+
+    context "without parameters" do
+      setup do
+        content = <<~CONTENT
+          ---
+          title: without parameters
+          ---
+
+          {% include params.html %}
+        CONTENT
+        render_content(content)
+      end
+
+      should "include file with empty parameters" do
+        assert_match "", @result
+      end
+    end
+
+    context "with include file with special characters without params" do
+      setup do
+        content = <<~CONTENT
+          ---
+          title: special characters
+          ---
+
+          {% include params@2.0.html %}
+        CONTENT
+        render_content(content)
+      end
+
+      should "include file with empty parameters" do
+        assert_match "", @result
+      end
+    end
+
+    context "with include file with special characters with params" do
+      setup do
+        content = <<~CONTENT
+          ---
+          title: special characters
+          ---
+
+          {% include params@2.0.html param1="foobar" param2="bazbar" %}
+        CONTENT
+        render_content(content)
+      end
+
+      should "include file with empty parameters" do
+        assert_match "
  • param1 = foobar
    • ", @result
+        assert_match "
  • param2 = bazbar
    • ", @result
+      end
+    end
+
+    context "with custom includes directory" do
+      setup do
+        content = <<~CONTENT
+          ---
+          title: custom includes directory
+          ---
+
+          {% include custom.html %}
+        CONTENT
+
+        render_content(content, "includes_dir" => "_includes_custom")
+      end
+
+      should "include file from custom directory" do
+        assert_match "custom_included", @result
+      end
+    end
+
+    context "without parameters within if statement" do
+      setup do
+        content = <<~CONTENT
+          ---
+          title: without parameters within if statement
+          ---
+
+          {% if true %}{% include params.html %}{% endif %}
+        CONTENT
+        render_content(content)
+      end
+
+      should "include file with empty parameters within if statement" do
+        assert_match "", @result
+      end
+    end
+
+    context "include missing file" do
+      setup do
+        @content = <<~CONTENT
+          ---
+          title: missing file
+          ---
+
+          {% include missing.html %}
+        CONTENT
+      end
+
+      should "raise error relative to source directory" do
+        exception = assert_raises IOError do
+          render_content(@content)
+        end
+        assert_match(
+          "Could not locate the included file 'missing.html' in any of " \
+          "[\"#{source_dir}/_includes\"].",
+          exception.message
+        )
+      end
+    end
+
+    context "include tag with variable and liquid filters" do
+      setup do
+        site = fixture_site.tap do |s|
+          s.read
+          s.render
+        end
+        post = site.posts.docs.find do |p|
+          p.basename.eql? "2013-12-17-include-variable-filters.markdown"
+        end
+        @content = post.output
+      end
+
+      should "include file as variable with liquid filters" do
+        assert_match(%r!1 included!, @content)
+        assert_match(%r!2 included!, @content)
+        assert_match(%r!3 included!, @content)
+      end
+
+      should "include file as variable and liquid filters with arbitrary whitespace" do
+        assert_match(%r!4 included!, @content)
+        assert_match(%r!5 included!, @content)
+        assert_match(%r!6 included!, @content)
+      end
+
+      should "include file as variable and filters with additional parameters" do
+        assert_match("
  • var1 = foo
    • ", @content)
+        assert_match("
  • var2 = bar
    • ", @content)
+      end
+
+      should "include file as partial variable" do
+        assert_match(%r!8 included!, @content)
+      end
+    end
+  end
+end
diff --git a/test/test_tag_include_relative.rb b/test/test_tag_include_relative.rb
new file mode 100644
index 00000000000..a378c418056
--- /dev/null
+++ b/test/test_tag_include_relative.rb
@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+require "helper"
+
+class TestTagIncludeRelative < TagUnitTest
+  context "include_relative tag with variable and liquid filters" do
+    setup do
+      site = fixture_site.tap do |s|
+        s.read
+        s.render
+      end
+
+      post = site.posts.docs.find do |p|
+        p.basename.eql? "2014-09-02-relative-includes.markdown"
+      end
+
+      @content = post.output
+    end
+
+    should "include file as variable with liquid filters" do
+      assert_match(%r!1 relative_include!, @content)
+      assert_match(%r!2 relative_include!, @content)
+      assert_match(%r!3 relative_include!, @content)
+    end
+
+    should "include file as variable and liquid filters with arbitrary whitespace" do
+      assert_match(%r!4 relative_include!, @content)
+      assert_match(%r!5 relative_include!, @content)
+      assert_match(%r!6 relative_include!, @content)
+    end
+
+    should "include file as variable and filters with additional parameters" do
+      assert_match("
  • var1 = foo
    • ", @content)
+      assert_match("
  • var2 = bar
    • ", @content)
+    end
+
+    should "include file as partial variable" do
+      assert_match(%r!8 relative_include!, @content)
+    end
+
+    should "include files relative to self" do
+      assert_match(%r!9 —\ntitle: Test Post Where YAML!, @content)
+    end
+
+    context "trying to do bad stuff" do
+      context "include missing file" do
+        setup do
+          @content = <<~CONTENT
+            ---
+            title: missing file
+            ---
+
+            {% include_relative missing.html %}
+          CONTENT
+        end
+
+        should "raise error relative to source directory" do
+          exception = assert_raises(IOError) { render_content(@content) }
+          assert_match "Could not locate the included file 'missing.html' in any of " \
+                       "[\"#{source_dir}\"].", exception.message
+        end
+      end
+
+      context "include existing file above you" do
+        setup do
+          @content = <<~CONTENT
+            ---
+            title: higher file
+            ---
+
+            {% include_relative ../README.markdown %}
+          CONTENT
+        end
+
+        should "raise error relative to source directory" do
+          exception = assert_raises(ArgumentError) { render_content(@content) }
+          assert_equal(
+            "Invalid syntax for include tag. File contains invalid characters or " \
+            "sequences:\n\n  ../README.markdown\n\nValid syntax:\n\n  " \
+            "{% include_relative file.ext param='value' param2='value' %}\n\n",
+            exception.message
+          )
+        end
+      end
+    end
+
+    context "with symlink'd include" do
+      should "not allow symlink includes" do
+        FileUtils.mkdir_p("tmp")
+        File.write("tmp/pages-test", "SYMLINK TEST")
+        assert_raises IOError do
+          content = <<~CONTENT
+            ---
+            title: Include symlink
+            ---
+
+            {% include_relative tmp/pages-test %}
+
+          CONTENT
+          render_content(content, "safe" => true)
+        end
+        @result ||= ""
+        refute_match(%r!SYMLINK TEST!, @result)
+      end
+
+      should "not expose the existence of symlinked files" do
+        exception = assert_raises IOError do
+          content = <<~CONTENT
+            ---
+            title: Include symlink
+            ---
+
+            {% include_relative tmp/pages-test-does-not-exist %}
+
+          CONTENT
+          render_content(content, "safe" => true)
+        end
+        assert_match(
+          "Ensure it exists in one of those directories and is not a symlink " \
+          "as those are not allowed in safe mode.",
+          exception.message
+        )
+      end
+    end
+  end
+end
diff --git a/test/test_tag_link.rb b/test/test_tag_link.rb
new file mode 100644
index 00000000000..e0d2a7141a2
--- /dev/null
+++ b/test/test_tag_link.rb
@@ -0,0 +1,206 @@
+# frozen_string_literal: true
+
+require "helper"
+
+class TestTagLink < TagUnitTest
+  def render_content_with_collection(content, collection_label)
+    render_content(
+      content,
+      "collections"      => { collection_label => { "output" => true } },
+      "read_collections" => true
+    )
+  end
+
+  context "post content has raw tag" do
+    setup do
+      content = <<~CONTENT
+        ---
+        title: This is a test
+        ---
+
+        ```liquid
+        {% raw %}
+        {% link _collection/name-of-document.md %}
+        {% endraw %}
+        ```
+      CONTENT
+      render_content(content)
+    end
+
+    should "render markdown with rouge" do
+      assert_match(
+        %(
    ) +
+          %(
    ),
+        @result
+      )
+    end
+  end
+
+  context "simple page with linking to a page" do
+    setup do
+      content = <<~CONTENT
+        ---
+        title: linking
+        ---
+
+        {% link contacts.html %}
+        {% link info.md %}
+        {% link /css/screen.css %}
+      CONTENT
+      render_content(content, "read_all" => true)
+    end
+
+    should "not cause an error" do
+      refute_match(%r!markdown-html-error!, @result)
+    end
+
+    should "have the URL to the 'contacts' item" do
+      assert_match(%r!/contacts\.html!, @result)
+    end
+
+    should "have the URL to the 'info' item" do
+      assert_match(%r!/info\.html!, @result)
+    end
+
+    should "have the URL to the 'screen.css' item" do
+      assert_match(%r!/css/screen\.css!, @result)
+    end
+  end
+
+  context "simple page with dynamic linking to a page" do
+    setup do
+      content = <<~CONTENT
+        ---
+        title: linking
+        ---
+
+        {% assign contacts_filename = 'contacts' %}
+        {% assign contacts_ext = 'html' %}
+        {% link {{contacts_filename}}.{{contacts_ext}} %}
+        {% assign info_path = 'info.md' %}
+        {% link {{\ info_path\ }} %}
+        {% assign screen_css_path = '/css' %}
+        {% link {{ screen_css_path }}/screen.css %}
+      CONTENT
+      render_content(content, "read_all" => true)
+    end
+
+    should "not cause an error" do
+      refute_match(%r!markdown-html-error!, @result)
+    end
+
+    should "have the URL to the 'contacts' item" do
+      assert_match(%r!/contacts\.html!, @result)
+    end
+
+    should "have the URL to the 'info' item" do
+      assert_match(%r!/info\.html!, @result)
+    end
+
+    should "have the URL to the 'screen.css' item" do
+      assert_match(%r!/css/screen\.css!, @result)
+    end
+  end
+
+  context "simple page with linking" do
+    setup do
+      content = <<~CONTENT
+        ---
+        title: linking
+        ---
+
+        {% link _methods/yaml_with_dots.md %}
+      CONTENT
+      render_content_with_collection(content, "methods")
+    end
+
+    should "not cause an error" do
+      refute_match(%r!markdown-html-error!, @result)
+    end
+
+    should "have the URL to the 'yaml_with_dots' item" do
+      assert_match(%r!/methods/yaml_with_dots\.html!, @result)
+    end
+  end
+
+  context "simple page with dynamic linking" do
+    setup do
+      content = <<~CONTENT
+        ---
+        title: linking
+        ---
+
+        {% assign yaml_with_dots_path = '_methods/yaml_with_dots.md' %}
+        {% link {{yaml_with_dots_path}} %}
+      CONTENT
+      render_content_with_collection(content, "methods")
+    end
+
+    should "not cause an error" do
+      refute_match(%r!markdown-html-error!, @result)
+    end
+
+    should "have the URL to the 'yaml_with_dots' item" do
+      assert_match(%r!/methods/yaml_with_dots\.html!, @result)
+    end
+  end
+
+  context "simple page with nested linking" do
+    setup do
+      content = <<~CONTENT
+        ---
+        title: linking
+        ---
+
+        - 1 {% link _methods/sanitized_path.md %}
+        - 2 {% link _methods/site/generate.md %}
+      CONTENT
+      render_content_with_collection(content, "methods")
+    end
+
+    should "not cause an error" do
+      refute_match(%r!markdown-html-error!, @result)
+    end
+
+    should "have the URL to the 'sanitized_path' item" do
+      assert_match %r!1\s/methods/sanitized_path\.html!, @result
+    end
+
+    should "have the URL to the 'site/generate' item" do
+      assert_match %r!2\s/methods/site/generate\.html!, @result
+    end
+  end
+
+  context "simple page with invalid linking" do
+    should "cause an error" do
+      content = <<~CONTENT
+        ---
+        title: Invalid linking
+        ---
+
+        {% link non-existent-collection-item %}
+      CONTENT
+
+      assert_raises ArgumentError do
+        render_content_with_collection(content, "methods")
+      end
+    end
+  end
+
+  context "simple page with invalid dynamic linking" do
+    should "cause an error" do
+      content = <<~CONTENT
+        ---
+        title: Invalid linking
+        ---
+
+        {% assign non_existent_path = 'non-existent-collection-item' %}
+        {% link {{\ non_existent_path\ }} %}
+      CONTENT
+
+      assert_raises ArgumentError do
+        render_content_with_collection(content, "methods")
+      end
+    end
+  end
+end
diff --git a/test/test_tag_post_url.rb b/test/test_tag_post_url.rb
new file mode 100644
index 00000000000..5a48857b04c
--- /dev/null
+++ b/test/test_tag_post_url.rb
@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+require "helper"
+
+class TestTagPostUrl < TagUnitTest
+  context "simple page with post linking" do
+    setup do
+      content = <<~CONTENT
+        ---
+        title: Post linking
+        ---
+
+        {% post_url 2008-11-21-complex %}
+      CONTENT
+
+      render_content(content, "permalink" => "pretty", "read_posts" => true)
+    end
+
+    should "not cause an error" do
+      refute_match %r!markdown-html-error!, @result
+    end
+
+    should "have the URL to the 'complex' post from 2008-11-21" do
+      assert_match %r!/2008/11/21/complex/!, @result
+    end
+  end
+
+  context "simple page with post linking containing special characters" do
+    setup do
+      content = <<~CONTENT
+        ---
+        title: Post linking
+        ---
+
+        {% post_url 2016-11-26-special-chars-(+) %}
+      CONTENT
+
+      render_content(content, "permalink" => "pretty", "read_posts" => true)
+    end
+
+    should "not cause an error" do
+      refute_match %r!markdown-html-error!, @result
+    end
+
+    should "have the URL to the 'special-chars' post from 2016-11-26" do
+      assert_match %r!/2016/11/26/special-chars-\(\+\)/!, @result
+    end
+  end
+
+  context "simple page with nested post linking" do
+    setup do
+      content = <<~CONTENT
+        ---
+        title: Post linking
+        ---
+
+        - 1 {% post_url 2008-11-21-complex %}
+        - 2 {% post_url /2008-11-21-complex %}
+        - 3 {% post_url es/2008-11-21-nested %}
+        - 4 {% post_url /es/2008-11-21-nested %}
+      CONTENT
+
+      render_content(content, "permalink" => "pretty", "read_posts" => true)
+    end
+
+    should "not cause an error" do
+      refute_match %r!markdown-html-error!, @result
+    end
+
+    should "have the URL to the 'complex' post from 2008-11-21" do
+      assert_match %r!1\s/2008/11/21/complex/!, @result
+      assert_match %r!2\s/2008/11/21/complex/!, @result
+    end
+
+    should "have the URL to the 'nested' post from 2008-11-21" do
+      assert_match %r!3\s/2008/11/21/nested/!, @result
+      assert_match %r!4\s/2008/11/21/nested/!, @result
+    end
+  end
+
+  context "simple page with nested post linking and path not used in `post_url`" do
+    setup do
+      content = <<~CONTENT
+        ---
+        title: Deprecated Post linking
+        ---
+
+        - 1 {% post_url 2008-11-21-nested %}
+      CONTENT
+
+      render_content(content, "permalink" => "pretty", "read_posts" => true)
+    end
+
+    should "not cause an error" do
+      refute_match(%r!markdown-html-error!, @result)
+    end
+
+    should "have the url to the 'nested' post from 2008-11-21" do
+      assert_match %r!1\s/2008/11/21/nested/!, @result
+    end
+
+    should "throw a deprecation warning" do
+      deprecation_warning = "       Deprecation: A call to '{% post_url 2008-11-21-nested %}' " \
+                            "did not match a post using the new matching method of checking " \
+                            "name (path-date-slug) equality. Please make sure that you change " \
+                            "this tag to match the post's name exactly."
+      assert_includes Jekyll.logger.messages, deprecation_warning
+    end
+  end
+
+  context "simple page with invalid post name linking" do
+    should "cause an error" do
+      assert_raises Jekyll::Errors::PostURLError do
+        render_content(<<~CONTENT, "read_posts" => true)
+          ---
+          title: Invalid post name linking
+          ---
+
+          {% post_url abc2008-11-21-complex %}
+        CONTENT
+      end
+    end
+
+    should "cause an error with a bad date" do
+      assert_raises Jekyll::Errors::InvalidDateError do
+        render_content(<<~CONTENT, "read_posts" => true)
+          ---
+          title: Invalid post name linking
+          ---
+
+          {% post_url 2008-42-21-complex %}
+        CONTENT
+      end
+    end
+  end
+end
diff --git a/test/test_tags.rb b/test/test_tags.rb
deleted file mode 100644
index a82a6f2e174..00000000000
--- a/test/test_tags.rb
+++ /dev/null
@@ -1,1191 +0,0 @@
-# frozen_string_literal: true
-
-require "helper"
-
-class TestTags < JekyllUnitTest
-  def setup
-    FileUtils.mkdir_p("tmp")
-  end
-
-  def create_post(content, override = {}, converter_class = Jekyll::Converters::Markdown)
-    site = fixture_site({ "highlighter" => "rouge" }.merge(override))
-
-    site.posts.docs.concat(PostReader.new(site).read_posts("")) if override["read_posts"]
-    CollectionReader.new(site).read if override["read_collections"]
-    site.read if override["read_all"]
-
-    info = { :filters => [Jekyll::Filters], :registers => { :site => site } }
-    @converter = site.converters.find { |c| c.instance_of?(converter_class) }
-    payload = { "highlighter_prefix" => @converter.highlighter_prefix,
-                "highlighter_suffix" => @converter.highlighter_suffix, }
-
-    @result = Liquid::Template.parse(content).render!(payload, info)
-    @result = @converter.convert(@result)
-  end
-
-  def fill_post(code, override = {})
-    content = <<~CONTENT
-      ---
-      title: This is a test
-      ---
-
-      This document has some highlighted code in it.
-
-      {% highlight text %}
-      #{code}
-      {% endhighlight %}
-      {% highlight text linenos %}
-      #{code}
-      {% endhighlight %}
-    CONTENT
-    create_post(content, override)
-  end
-
-  def highlight_block_with_opts(options_string)
-    Jekyll::Tags::HighlightBlock.parse(
-      "highlight",
-      options_string,
-      Liquid::Tokenizer.new("test{% endhighlight %}\n"),
-      Liquid::ParseContext.new
-    )
-  end
-
-  context "language name" do
-    should "match only the required set of chars" do
-      r = Jekyll::Tags::HighlightBlock::SYNTAX
-      assert_match r, "ruby"
-      assert_match r, "c#"
-      assert_match r, "xml+cheetah"
-      assert_match r, "x.y"
-      assert_match r, "coffee-script"
-      assert_match r, "shell_session"
-
-      refute_match r, "blah^"
-
-      assert_match r, "ruby key=val"
-      assert_match r, "ruby a=b c=d"
-    end
-  end
-
-  context "highlight tag in unsafe mode" do
-    should "set the no options with just a language name" do
-      tag = highlight_block_with_opts("ruby ")
-      assert_equal({}, tag.instance_variable_get(:@highlight_options))
-    end
-
-    should "set the linenos option as 'inline' if no linenos value" do
-      tag = highlight_block_with_opts("ruby linenos ")
-      assert_equal(
-        { :linenos => "inline" },
-        tag.instance_variable_get(:@highlight_options)
-      )
-    end
-
-    should "set the linenos option to 'table' " \
-           "if the linenos key is given the table value" do
-      tag = highlight_block_with_opts("ruby linenos=table ")
-      assert_equal(
-        { :linenos => "table" },
-        tag.instance_variable_get(:@highlight_options)
-      )
-    end
-
-    should "recognize nowrap option with linenos set" do
-      tag = highlight_block_with_opts("ruby linenos=table nowrap ")
-      assert_equal(
-        { :linenos => "table", :nowrap => true },
-        tag.instance_variable_get(:@highlight_options)
-      )
-    end
-
-    should "recognize the cssclass option" do
-      tag = highlight_block_with_opts("ruby linenos=table cssclass=hl ")
-      assert_equal(
-        { :cssclass => "hl", :linenos => "table" },
-        tag.instance_variable_get(:@highlight_options)
-      )
-    end
-
-    should "recognize the hl_linenos option and its value" do
-      tag = highlight_block_with_opts("ruby linenos=table cssclass=hl hl_linenos=3 ")
-      assert_equal(
-        { :cssclass => "hl", :linenos => "table", :hl_linenos => "3" },
-        tag.instance_variable_get(:@highlight_options)
-      )
-    end
-
-    should "recognize multiple values of hl_linenos" do
-      tag = highlight_block_with_opts 'ruby linenos=table cssclass=hl hl_linenos="3 5 6" '
-      assert_equal(
-        { :cssclass => "hl", :linenos => "table", :hl_linenos => %w(3 5 6) },
-        tag.instance_variable_get(:@highlight_options)
-      )
-    end
-
-    should "treat language name as case insensitive" do
-      tag = highlight_block_with_opts("Ruby ")
-      assert_equal(
-        "ruby",
-        tag.instance_variable_get(:@lang),
-        "lexers should be case insensitive"
-      )
-    end
-  end
-
-  context "with the rouge highlighter" do
-    context "post content has highlight tag" do
-      setup do
-        fill_post("test")
-      end
-
-      should "render markdown with rouge" do
-        assert_match(
-          %(
    test
    ),
-          @result
-        )
-      end
-
-      should "render markdown with rouge with line numbers" do
-        assert_match(
-          %() +
-            %() +
-            %() +
-            %(
    ) +
-            %(
    1\n
    test\n
    ),
-          @result
-        )
-      end
-    end
-
-    context "post content has raw tag" do
-      setup do
-        content = <<~CONTENT
-          ---
-          title: This is a test
-          ---
-
-          ```liquid
-          {% raw %}
-          {{ site.baseurl }}{% link _collection/name-of-document.md %}
-          {% endraw %}
-          ```
-        CONTENT
-        create_post(content)
-      end
-
-      should "render markdown with rouge" do
-        assert_match(
-          %(
    ) +
-            %(
    ),
-          @result
-        )
-      end
-    end
-
-    context "post content has highlight with file reference" do
-      setup do
-        fill_post("./jekyll.gemspec")
-      end
-
-      should "not embed the file" do
-        assert_match(
-          '
    ' \
-          "./jekyll.gemspec
    ",
-          @result
-        )
-      end
-    end
-
-    context "post content has highlight tag with UTF character" do
-      setup do
-        fill_post("Æ")
-      end
-
-      should "render markdown with pygments line handling" do
-        assert_match(
-          '
    Æ
    ',
-          @result
-        )
-      end
-    end
-
-    context "post content has highlight tag with preceding spaces & lines" do
-      setup do
-        fill_post <<~EOS
-
-
-               [,1] [,2]
-          [1,] FALSE TRUE
-          [2,] FALSE TRUE
-        EOS
-      end
-
-      should "only strip the preceding newlines" do
-        assert_match(
-          '
         [,1] [,2]',
-          @result
-        )
-      end
-    end
-
-    context "post content has highlight tag with " \
-            "preceding spaces & lines in several places" do
-      setup do
-        fill_post <<~EOS
-
-
-               [,1] [,2]
-
-
-          [1,] FALSE TRUE
-          [2,] FALSE TRUE
-
-
-        EOS
-      end
-
-      should "only strip the newlines which precede and succeed the entire block" do
-        assert_match(
-          "
         [,1] [,2]\n\n\n" \
-          "[1,] FALSE TRUE\n[2,] FALSE TRUE
    ",
-          @result
-        )
-      end
-    end
-
-    context "post content has highlight tag with linenumbers" do
-      setup do
-        create_post <<~EOS
-          ---
-          title: This is a test
-          ---
-
-          This is not yet highlighted
-          {% highlight php linenos %}
-          test
-          {% endhighlight %}
-
-          This should not be highlighted, right?
-        EOS
-      end
-
-      should "should stop highlighting at boundary with rouge" do
-        expected = <<~EOS
-          
    This is not yet highlighted
    \n
-          
    1
-          
    test\n
    \n
-          
    This should not be highlighted, right?
    
-        EOS
-        assert_match(expected, @result)
-      end
-    end
-
-    context "post content has highlight tag with " \
-            "preceding spaces & Windows-style newlines" do
-      setup do
-        fill_post "\r\n\r\n\r\n     [,1] [,2]"
-      end
-
-      should "only strip the preceding newlines" do
-        assert_match(
-          '
         [,1] [,2]',
-          @result
-        )
-      end
-    end
-
-    context "post content has highlight tag with only preceding spaces" do
-      setup do
-        fill_post <<~EOS
-               [,1] [,2]
-          [1,] FALSE TRUE
-          [2,] FALSE TRUE
-        EOS
-      end
-
-      should "only strip the preceding newlines" do
-        assert_match(
-          '
         [,1] [,2]',
-          @result
-        )
-      end
-    end
-  end
-
-  context "simple post with markdown and pre tags" do
-    setup do
-      @content = <<~CONTENT
-        ---
-        title: Kramdown post with pre
-        ---
-
-        _FIGHT!_
-
-        {% highlight ruby %}
-        puts "3..2..1.."
-        {% endhighlight %}
-
-        *FINISH HIM*
-      CONTENT
-    end
-
-    context "using Kramdown" do
-      setup do
-        create_post(@content, "markdown" => "kramdown")
-      end
-
-      should "parse correctly" do
-        assert_match %r{FIGHT!}, @result
-        assert_match %r!FINISH HIM!, @result
-      end
-    end
-  end
-
-  context "simple page with post linking" do
-    setup do
-      content = <<~CONTENT
-        ---
-        title: Post linking
-        ---
-
-        {% post_url 2008-11-21-complex %}
-      CONTENT
-      create_post(content,
-                  "permalink"   => "pretty",
-                  "source"      => source_dir,
-                  "destination" => dest_dir,
-                  "read_posts"  => true)
-    end
-
-    should "not cause an error" do
-      refute_match(%r!markdown-html-error!, @result)
-    end
-
-    should "have the URL to the 'complex' post from 2008-11-21" do
-      assert_match %r!/2008/11/21/complex/!, @result
-    end
-  end
-
-  context "simple page with post linking containing special characters" do
-    setup do
-      content = <<~CONTENT
-        ---
-        title: Post linking
-        ---
-
-        {% post_url 2016-11-26-special-chars-(+) %}
-      CONTENT
-      create_post(content,
-                  "permalink"   => "pretty",
-                  "source"      => source_dir,
-                  "destination" => dest_dir,
-                  "read_posts"  => true)
-    end
-
-    should "not cause an error" do
-      refute_match(%r!markdown-html-error!, @result)
-    end
-
-    should "have the URL to the 'special-chars' post from 2016-11-26" do
-      assert_match %r!/2016/11/26/special-chars-\(\+\)/!, @result
-    end
-  end
-
-  context "simple page with nested post linking" do
-    setup do
-      content = <<~CONTENT
-        ---
-        title: Post linking
-        ---
-
-        - 1 {% post_url 2008-11-21-complex %}
-        - 2 {% post_url /2008-11-21-complex %}
-        - 3 {% post_url es/2008-11-21-nested %}
-        - 4 {% post_url /es/2008-11-21-nested %}
-      CONTENT
-      create_post(content,
-                  "permalink"   => "pretty",
-                  "source"      => source_dir,
-                  "destination" => dest_dir,
-                  "read_posts"  => true)
-    end
-
-    should "not cause an error" do
-      refute_match(%r!markdown-html-error!, @result)
-    end
-
-    should "have the URL to the 'complex' post from 2008-11-21" do
-      assert_match %r!1\s/2008/11/21/complex/!, @result
-      assert_match %r!2\s/2008/11/21/complex/!, @result
-    end
-
-    should "have the URL to the 'nested' post from 2008-11-21" do
-      assert_match %r!3\s/2008/11/21/nested/!, @result
-      assert_match %r!4\s/2008/11/21/nested/!, @result
-    end
-  end
-
-  context "simple page with nested post linking and path not used in `post_url`" do
-    setup do
-      content = <<~CONTENT
-        ---
-        title: Deprecated Post linking
-        ---
-
-        - 1 {% post_url 2008-11-21-nested %}
-      CONTENT
-      create_post(content,
-                  "permalink"   => "pretty",
-                  "source"      => source_dir,
-                  "destination" => dest_dir,
-                  "read_posts"  => true)
-    end
-
-    should "not cause an error" do
-      refute_match(%r!markdown-html-error!, @result)
-    end
-
-    should "have the url to the 'nested' post from 2008-11-21" do
-      assert_match %r!1\s/2008/11/21/nested/!, @result
-    end
-
-    should "throw a deprecation warning" do
-      deprecation_warning = "       Deprecation: A call to '{% post_url 2008-11-21-nested %}' " \
-                            "did not match a post using the new matching method of checking " \
-                            "name (path-date-slug) equality. Please make sure that you change " \
-                            "this tag to match the post's name exactly."
-      assert_includes Jekyll.logger.messages, deprecation_warning
-    end
-  end
-
-  context "simple page with invalid post name linking" do
-    should "cause an error" do
-      content = <<~CONTENT
-        ---
-        title: Invalid post name linking
-        ---
-
-        {% post_url abc2008-11-21-complex %}
-      CONTENT
-
-      assert_raises Jekyll::Errors::PostURLError do
-        create_post(content,
-                    "permalink"   => "pretty",
-                    "source"      => source_dir,
-                    "destination" => dest_dir,
-                    "read_posts"  => true)
-      end
-    end
-
-    should "cause an error with a bad date" do
-      content = <<~CONTENT
-        ---
-        title: Invalid post name linking
-        ---
-
-        {% post_url 2008-42-21-complex %}
-      CONTENT
-
-      assert_raises Jekyll::Errors::InvalidDateError do
-        create_post(content,
-                    "permalink"   => "pretty",
-                    "source"      => source_dir,
-                    "destination" => dest_dir,
-                    "read_posts"  => true)
-      end
-    end
-  end
-
-  context "simple page with linking to a page" do
-    setup do
-      content = <<~CONTENT
-        ---
-        title: linking
-        ---
-
-        {% link contacts.html %}
-        {% link info.md %}
-        {% link /css/screen.css %}
-      CONTENT
-      create_post(content,
-                  "source"      => source_dir,
-                  "destination" => dest_dir,
-                  "read_all"    => true)
-    end
-
-    should "not cause an error" do
-      refute_match(%r!markdown-html-error!, @result)
-    end
-
-    should "have the URL to the 'contacts' item" do
-      assert_match(%r!/contacts\.html!, @result)
-    end
-
-    should "have the URL to the 'info' item" do
-      assert_match(%r!/info\.html!, @result)
-    end
-
-    should "have the URL to the 'screen.css' item" do
-      assert_match(%r!/css/screen\.css!, @result)
-    end
-  end
-
-  context "simple page with dynamic linking to a page" do
-    setup do
-      content = <<~CONTENT
-        ---
-        title: linking
-        ---
-
-        {% assign contacts_filename = 'contacts' %}
-        {% assign contacts_ext = 'html' %}
-        {% link {{contacts_filename}}.{{contacts_ext}} %}
-        {% assign info_path = 'info.md' %}
-        {% link {{\ info_path\ }} %}
-        {% assign screen_css_path = '/css' %}
-        {% link {{ screen_css_path }}/screen.css %}
-      CONTENT
-      create_post(content,
-                  "source"      => source_dir,
-                  "destination" => dest_dir,
-                  "read_all"    => true)
-    end
-
-    should "not cause an error" do
-      refute_match(%r!markdown-html-error!, @result)
-    end
-
-    should "have the URL to the 'contacts' item" do
-      assert_match(%r!/contacts\.html!, @result)
-    end
-
-    should "have the URL to the 'info' item" do
-      assert_match(%r!/info\.html!, @result)
-    end
-
-    should "have the URL to the 'screen.css' item" do
-      assert_match(%r!/css/screen\.css!, @result)
-    end
-  end
-
-  context "simple page with linking" do
-    setup do
-      content = <<~CONTENT
-        ---
-        title: linking
-        ---
-
-        {% link _methods/yaml_with_dots.md %}
-      CONTENT
-      create_post(content,
-                  "source"           => source_dir,
-                  "destination"      => dest_dir,
-                  "collections"      => { "methods" => { "output" => true } },
-                  "read_collections" => true)
-    end
-
-    should "not cause an error" do
-      refute_match(%r!markdown-html-error!, @result)
-    end
-
-    should "have the URL to the 'yaml_with_dots' item" do
-      assert_match(%r!/methods/yaml_with_dots\.html!, @result)
-    end
-  end
-
-  context "simple page with dynamic linking" do
-    setup do
-      content = <<~CONTENT
-        ---
-        title: linking
-        ---
-
-        {% assign yaml_with_dots_path = '_methods/yaml_with_dots.md' %}
-        {% link {{yaml_with_dots_path}} %}
-      CONTENT
-      create_post(content,
-                  "source"           => source_dir,
-                  "destination"      => dest_dir,
-                  "collections"      => { "methods" => { "output" => true } },
-                  "read_collections" => true)
-    end
-
-    should "not cause an error" do
-      refute_match(%r!markdown-html-error!, @result)
-    end
-
-    should "have the URL to the 'yaml_with_dots' item" do
-      assert_match(%r!/methods/yaml_with_dots\.html!, @result)
-    end
-  end
-
-  context "simple page with nested linking" do
-    setup do
-      content = <<~CONTENT
-        ---
-        title: linking
-        ---
-
-        - 1 {% link _methods/sanitized_path.md %}
-        - 2 {% link _methods/site/generate.md %}
-      CONTENT
-      create_post(content,
-                  "source"           => source_dir,
-                  "destination"      => dest_dir,
-                  "collections"      => { "methods" => { "output" => true } },
-                  "read_collections" => true)
-    end
-
-    should "not cause an error" do
-      refute_match(%r!markdown-html-error!, @result)
-    end
-
-    should "have the URL to the 'sanitized_path' item" do
-      assert_match %r!1\s/methods/sanitized_path\.html!, @result
-    end
-
-    should "have the URL to the 'site/generate' item" do
-      assert_match %r!2\s/methods/site/generate\.html!, @result
-    end
-  end
-
-  context "simple page with invalid linking" do
-    should "cause an error" do
-      content = <<~CONTENT
-        ---
-        title: Invalid linking
-        ---
-
-        {% link non-existent-collection-item %}
-      CONTENT
-
-      assert_raises ArgumentError do
-        create_post(content,
-                    "source"           => source_dir,
-                    "destination"      => dest_dir,
-                    "collections"      => { "methods" => { "output" => true } },
-                    "read_collections" => true)
-      end
-    end
-  end
-
-  context "simple page with invalid dynamic linking" do
-    should "cause an error" do
-      content = <<~CONTENT
-        ---
-        title: Invalid linking
-        ---
-
-        {% assign non_existent_path = 'non-existent-collection-item' %}
-        {% link {{\ non_existent_path\ }} %}
-      CONTENT
-
-      assert_raises ArgumentError do
-        create_post(content,
-                    "source"           => source_dir,
-                    "destination"      => dest_dir,
-                    "collections"      => { "methods" => { "output" => true } },
-                    "read_collections" => true)
-      end
-    end
-  end
-
-  context "include tag with parameters" do
-    context "with symlink'd include" do
-      should "not allow symlink includes" do
-        File.write("tmp/pages-test", "SYMLINK TEST")
-        assert_raises IOError do
-          content = <<~CONTENT
-            ---
-            title: Include symlink
-            ---
-
-            {% include tmp/pages-test %}
-
-          CONTENT
-          create_post(content,
-                      "permalink"   => "pretty",
-                      "source"      => source_dir,
-                      "destination" => dest_dir,
-                      "read_posts"  => true,
-                      "safe"        => true)
-        end
-        @result ||= ""
-        refute_match(%r!SYMLINK TEST!, @result)
-      end
-
-      should "not expose the existence of symlinked files" do
-        ex = assert_raises IOError do
-          content = <<~CONTENT
-            ---
-            title: Include symlink
-            ---
-
-            {% include tmp/pages-test-does-not-exist %}
-
-          CONTENT
-          create_post(content,
-                      "permalink"   => "pretty",
-                      "source"      => source_dir,
-                      "destination" => dest_dir,
-                      "read_posts"  => true,
-                      "safe"        => true)
-        end
-        assert_match(
-          "Could not locate the included file 'tmp/pages-test-does-not-exist' " \
-          "in any of [\"#{source_dir}/_includes\"]. Ensure it exists in one of " \
-          "those directories and is not a symlink as those are not allowed in " \
-          "safe mode.",
-          ex.message
-        )
-      end
-    end
-
-    context "with one parameter" do
-      setup do
-        content = <<~CONTENT
-          ---
-          title: Include tag parameters
-          ---
-
-          {% include sig.markdown myparam="test" %}
-
-          {% include params.html param="value" %}
-        CONTENT
-        create_post(content,
-                    "permalink"   => "pretty",
-                    "source"      => source_dir,
-                    "destination" => dest_dir,
-                    "read_posts"  => true)
-      end
-
-      should "correctly output include variable" do
-        assert_match "value", @result.strip
-      end
-
-      should "ignore parameters if unused" do
-        assert_match "
    \n
    Tom Preston-Werner\ngithub.com/mojombo
    \n", @result
-      end
-    end
-
-    context "with simple syntax but multiline markup" do
-      setup do
-        content = <<~CONTENT
-          ---
-          title: Include tag parameters
-          ---
-
-          {% include sig.markdown myparam="test" %}
-
-          {% include params.html
-            param="value" %}
-        CONTENT
-        create_post(content,
-                    "permalink"   => "pretty",
-                    "source"      => source_dir,
-                    "destination" => dest_dir,
-                    "read_posts"  => true)
-      end
-
-      should "correctly output include variable" do
-        assert_match "value", @result.strip
-      end
-
-      should "ignore parameters if unused" do
-        assert_match "
    \n
    Tom Preston-Werner\ngithub.com/mojombo
    \n", @result
-      end
-    end
-
-    context "with variable syntax but multiline markup" do
-      setup do
-        content = <<~CONTENT
-          ---
-          title: Include tag parameters
-          ---
-
-          {% include sig.markdown myparam="test" %}
-          {% assign path = "params" | append: ".html" %}
-          {% include {{ path }}
-            param="value" %}
-        CONTENT
-        create_post(content,
-                    "permalink"   => "pretty",
-                    "source"      => source_dir,
-                    "destination" => dest_dir,
-                    "read_posts"  => true)
-      end
-
-      should "correctly output include variable" do
-        assert_match "value", @result.strip
-      end
-
-      should "ignore parameters if unused" do
-        assert_match "
    \n
    Tom Preston-Werner\ngithub.com/mojombo
    \n", @result
-      end
-    end
-
-    context "with invalid parameter syntax" do
-      should "throw a ArgumentError" do
-        content = <<~CONTENT
-          ---
-          title: Invalid parameter syntax
-          ---
-
-          {% include params.html param s="value" %}
-        CONTENT
-        assert_raises ArgumentError, "Did not raise exception on invalid " \
-                                     '"include" syntax' do
-          create_post(content,
-                      "permalink"   => "pretty",
-                      "source"      => source_dir,
-                      "destination" => dest_dir,
-                      "read_posts"  => true)
-        end
-
-        content = <<~CONTENT
-          ---
-          title: Invalid parameter syntax
-          ---
-
-          {% include params.html params="value %}
-        CONTENT
-        assert_raises ArgumentError, "Did not raise exception on invalid " \
-                                     '"include" syntax' do
-          create_post(content,
-                      "permalink"   => "pretty",
-                      "source"      => source_dir,
-                      "destination" => dest_dir,
-                      "read_posts"  => true)
-        end
-      end
-    end
-
-    context "with several parameters" do
-      setup do
-        content = <<~CONTENT
-          ---
-          title: multiple include parameters
-          ---
-
-          {% include params.html param1="new_value" param2="another" %}
-        CONTENT
-        create_post(content,
-                    "permalink"   => "pretty",
-                    "source"      => source_dir,
-                    "destination" => dest_dir,
-                    "read_posts"  => true)
-      end
-
-      should "list all parameters" do
-        assert_match "
  • param1 = new_value
    • ", @result
-        assert_match "
  • param2 = another
    • ", @result
-      end
-
-      should "not include previously used parameters" do
-        assert_match "", @result
-      end
-    end
-
-    context "without parameters" do
-      setup do
-        content = <<~CONTENT
-          ---
-          title: without parameters
-          ---
-
-          {% include params.html %}
-        CONTENT
-        create_post(content,
-                    "permalink"   => "pretty",
-                    "source"      => source_dir,
-                    "destination" => dest_dir,
-                    "read_posts"  => true)
-      end
-
-      should "include file with empty parameters" do
-        assert_match "", @result
-      end
-    end
-
-    context "with include file with special characters without params" do
-      setup do
-        content = <<~CONTENT
-          ---
-          title: special characters
-          ---
-
-          {% include params@2.0.html %}
-        CONTENT
-        create_post(content,
-                    "permalink"   => "pretty",
-                    "source"      => source_dir,
-                    "destination" => dest_dir,
-                    "read_posts"  => true)
-      end
-
-      should "include file with empty parameters" do
-        assert_match "", @result
-      end
-    end
-
-    context "with include file with special characters with params" do
-      setup do
-        content = <<~CONTENT
-          ---
-          title: special characters
-          ---
-
-          {% include params@2.0.html param1="foobar" param2="bazbar" %}
-        CONTENT
-        create_post(content,
-                    "permalink"   => "pretty",
-                    "source"      => source_dir,
-                    "destination" => dest_dir,
-                    "read_posts"  => true)
-      end
-
-      should "include file with empty parameters" do
-        assert_match "
  • param1 = foobar
    • ", @result
-        assert_match "
  • param2 = bazbar
    • ", @result
-      end
-    end
-
-    context "with custom includes directory" do
-      setup do
-        content = <<~CONTENT
-          ---
-          title: custom includes directory
-          ---
-
-          {% include custom.html %}
-        CONTENT
-        create_post(content,
-                    "includes_dir" => "_includes_custom",
-                    "permalink"    => "pretty",
-                    "source"       => source_dir,
-                    "destination"  => dest_dir,
-                    "read_posts"   => true)
-      end
-
-      should "include file from custom directory" do
-        assert_match "custom_included", @result
-      end
-    end
-
-    context "without parameters within if statement" do
-      setup do
-        content = <<~CONTENT
-          ---
-          title: without parameters within if statement
-          ---
-
-          {% if true %}{% include params.html %}{% endif %}
-        CONTENT
-        create_post(content,
-                    "permalink"   => "pretty",
-                    "source"      => source_dir,
-                    "destination" => dest_dir,
-                    "read_posts"  => true)
-      end
-
-      should "include file with empty parameters within if statement" do
-        assert_match "", @result
-      end
-    end
-
-    context "include missing file" do
-      setup do
-        @content = <<~CONTENT
-          ---
-          title: missing file
-          ---
-
-          {% include missing.html %}
-        CONTENT
-      end
-
-      should "raise error relative to source directory" do
-        exception = assert_raises IOError do
-          create_post(@content,
-                      "permalink"   => "pretty",
-                      "source"      => source_dir,
-                      "destination" => dest_dir,
-                      "read_posts"  => true)
-        end
-        assert_match(
-          "Could not locate the included file 'missing.html' in any of " \
-          "[\"#{source_dir}/_includes\"].",
-          exception.message
-        )
-      end
-    end
-
-    context "include tag with variable and liquid filters" do
-      setup do
-        site = fixture_site("pygments" => true).tap(&:read).tap(&:render)
-        post = site.posts.docs.find do |p|
-          p.basename.eql? "2013-12-17-include-variable-filters.markdown"
-        end
-        @content = post.output
-      end
-
-      should "include file as variable with liquid filters" do
-        assert_match(%r!1 included!, @content)
-        assert_match(%r!2 included!, @content)
-        assert_match(%r!3 included!, @content)
-      end
-
-      should "include file as variable and liquid filters with arbitrary whitespace" do
-        assert_match(%r!4 included!, @content)
-        assert_match(%r!5 included!, @content)
-        assert_match(%r!6 included!, @content)
-      end
-
-      should "include file as variable and filters with additional parameters" do
-        assert_match("
  • var1 = foo
    • ", @content)
-        assert_match("
  • var2 = bar
    • ", @content)
-      end
-
-      should "include file as partial variable" do
-        assert_match(%r!8 included!, @content)
-      end
-    end
-  end
-
-  context "relative include tag with variable and liquid filters" do
-    setup do
-      site = fixture_site("pygments" => true).tap(&:read).tap(&:render)
-      post = site.posts.docs.find do |p|
-        p.basename.eql? "2014-09-02-relative-includes.markdown"
-      end
-      @content = post.output
-    end
-
-    should "include file as variable with liquid filters" do
-      assert_match(%r!1 relative_include!, @content)
-      assert_match(%r!2 relative_include!, @content)
-      assert_match(%r!3 relative_include!, @content)
-    end
-
-    should "include file as variable and liquid filters with arbitrary whitespace" do
-      assert_match(%r!4 relative_include!, @content)
-      assert_match(%r!5 relative_include!, @content)
-      assert_match(%r!6 relative_include!, @content)
-    end
-
-    should "include file as variable and filters with additional parameters" do
-      assert_match("
  • var1 = foo
    • ", @content)
-      assert_match("
  • var2 = bar
    • ", @content)
-    end
-
-    should "include file as partial variable" do
-      assert_match(%r!8 relative_include!, @content)
-    end
-
-    should "include files relative to self" do
-      assert_match(%r!9 —\ntitle: Test Post Where YAML!, @content)
-    end
-
-    context "trying to do bad stuff" do
-      context "include missing file" do
-        setup do
-          @content = <<~CONTENT
-            ---
-            title: missing file
-            ---
-
-            {% include_relative missing.html %}
-          CONTENT
-        end
-
-        should "raise error relative to source directory" do
-          exception = assert_raises IOError do
-            create_post(@content,
-                        "permalink"   => "pretty",
-                        "source"      => source_dir,
-                        "destination" => dest_dir,
-                        "read_posts"  => true)
-          end
-          assert_match "Could not locate the included file 'missing.html' in any of " \
-                       "[\"#{source_dir}\"].", exception.message
-        end
-      end
-
-      context "include existing file above you" do
-        setup do
-          @content = <<~CONTENT
-            ---
-            title: higher file
-            ---
-
-            {% include_relative ../README.markdown %}
-          CONTENT
-        end
-
-        should "raise error relative to source directory" do
-          exception = assert_raises ArgumentError do
-            create_post(@content,
-                        "permalink"   => "pretty",
-                        "source"      => source_dir,
-                        "destination" => dest_dir,
-                        "read_posts"  => true)
-          end
-          assert_equal(
-            "Invalid syntax for include tag. File contains invalid characters or " \
-            "sequences:\n\n  ../README.markdown\n\nValid syntax:\n\n  " \
-            "{% include_relative file.ext param='value' param2='value' %}\n\n",
-            exception.message
-          )
-        end
-      end
-    end
-
-    context "with symlink'd include" do
-      should "not allow symlink includes" do
-        File.write("tmp/pages-test", "SYMLINK TEST")
-        assert_raises IOError do
-          content = <<~CONTENT
-            ---
-            title: Include symlink
-            ---
-
-            {% include_relative tmp/pages-test %}
-
-          CONTENT
-          create_post(content,
-                      "permalink"   => "pretty",
-                      "source"      => source_dir,
-                      "destination" => dest_dir,
-                      "read_posts"  => true,
-                      "safe"        => true)
-        end
-        @result ||= ""
-        refute_match(%r!SYMLINK TEST!, @result)
-      end
-
-      should "not expose the existence of symlinked files" do
-        ex = assert_raises IOError do
-          content = <<~CONTENT
-            ---
-            title: Include symlink
-            ---
-
-            {% include_relative tmp/pages-test-does-not-exist %}
-
-          CONTENT
-          create_post(content,
-                      "permalink"   => "pretty",
-                      "source"      => source_dir,
-                      "destination" => dest_dir,
-                      "read_posts"  => true,
-                      "safe"        => true)
-        end
-        assert_match(
-          "Ensure it exists in one of those directories and is not a symlink " \
-          "as those are not allowed in safe mode.",
-          ex.message
-        )
-      end
-    end
-  end
-end

From 0951a4653d3042745eaa50d4faaef28358343d71 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 26 Dec 2022 06:16:41 -0800
Subject: [PATCH 161/290] Update history to reflect merge of #9230 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 080320ae2bb..36010807b0c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
   * Run tests in utc (#9168)
   * Lock Ruby in CI to v3.1.2 and bump JRuby to v9.4.0.0 (#9196)
   * Update sass related tests for jekyll-sass-converter 3.x (#9223)
+  * Split `test/test_tags.rb` into multiple files (#9230)
 
 ### Bug Fixes
 

From 249101aea66a36969fca999d97ee7f1a12ac5fa8 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA 
Date: Thu, 29 Dec 2022 16:23:36 +0900
Subject: [PATCH 162/290] test: use hash explicitly for Struct initializer for
 ruby 3.2 (#9237)

Merge pull request 9237
---
 test/test_filters.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index ea82fc5b5e3..ee9b31af036 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -718,7 +718,7 @@ def to_liquid
           {
             "name" => name,
             :v     => 1,
-            :thing => M.new(:kay => "jewelers"),
+            :thing => M.new({:kay => "jewelers"}),
             :stuff => true,
           }
         end

From 39ee3317f4fa8a6b33ee650021f86697f210e3c0 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 28 Dec 2022 23:23:38 -0800
Subject: [PATCH 163/290] Update history to reflect merge of #9237 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 36010807b0c..3180eea0241 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,7 @@
   * Lock Ruby in CI to v3.1.2 and bump JRuby to v9.4.0.0 (#9196)
   * Update sass related tests for jekyll-sass-converter 3.x (#9223)
   * Split `test/test_tags.rb` into multiple files (#9230)
+  * test: use hash explicitly for Struct initializer for ruby 3.2 (#9237)
 
 ### Bug Fixes
 

From bfa7c948994b9fd040f9a3edea090069f766594a Mon Sep 17 00:00:00 2001
From: masaki <40445257+masaki9@users.noreply.github.com>
Date: Wed, 4 Jan 2023 03:09:05 -0800
Subject: [PATCH 164/290] Update Jekyll on macOS (macos.md) and current ruby
 version to 3.1.3 in ruby.yml (#9195)

Merge pull request 9195
---
 docs/_data/ruby.yml              | 4 ++--
 docs/_docs/installation/macos.md | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/_data/ruby.yml b/docs/_data/ruby.yml
index 3655def7c1a..a2171fe4183 100644
--- a/docs/_data/ruby.yml
+++ b/docs/_data/ruby.yml
@@ -1,3 +1,3 @@
 min_version: 2.5.0
-current_version: 3.1.2
-current_version_output: ruby 3.1.2p20 (2022-04-12 revision 4491bb740a)
+current_version: 3.1.3
+current_version_output: ruby 3.1.3p185 (2022-11-24 revision 1a6b16756e)
diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md
index d4452772a51..6bec19d4db8 100644
--- a/docs/_docs/installation/macos.md
+++ b/docs/_docs/installation/macos.md
@@ -51,10 +51,10 @@ Install `chruby` and `ruby-install` with Homebrew:
 brew install chruby ruby-install xz
 ```
 
-Install the latest stable version of Ruby:
+Install the latest stable version of Ruby (supported by Jekyll):
 
 ```sh
-ruby-install ruby
+ruby-install ruby {{ site.data.ruby.current_version }}
 ```
 
 This will take a few minutes, and once it's done, configure your shell to 

From a891118af45d6c96a2859dd6d914be78326e211d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 4 Jan 2023 03:09:07 -0800
Subject: [PATCH 165/290] Update history to reflect merge of #9195 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 3180eea0241..06fdeadc4f7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -9,6 +9,7 @@
   * Fix Nested tree navigation with recursion example (#9174)
   * Fix typo on website (#9203)
   * Publish post on major release of sass-converter (#9225)
+  * Update Jekyll on macOS (macos.md) and current ruby version to 3.1.3 in ruby.yml (#9195)
 
 ### Development Fixes
 

From 3a1848066bac6ae986f3cae52fae67d60e523b19 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 19 Jan 2023 12:30:21 +0530
Subject: [PATCH 166/290] Rename sass partial created for new blank site
 (#9257)

Merge pull request 9257
---
 features/create_sites.feature                     | 7 ++++++-
 lib/blank_template/_sass/{main.scss => base.scss} | 0
 lib/blank_template/assets/css/main.scss           | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 rename lib/blank_template/_sass/{main.scss => base.scss} (100%)

diff --git a/features/create_sites.feature b/features/create_sites.feature
index cd6e1b6c0c8..550f07e1444 100644
--- a/features/create_sites.feature
+++ b/features/create_sites.feature
@@ -14,10 +14,15 @@ Feature: Create sites
     And the test_blank/_sass directory should exist
     And the test_blank/assets/css directory should exist
     And the "test_blank/_layouts/default.html" file should exist
-    And the "test_blank/_sass/main.scss" file should exist
+    And the "test_blank/_sass/base.scss" file should exist
     And the "test_blank/assets/css/main.scss" file should exist
     And the "test_blank/_config.yml" file should exist
     And the "test_blank/index.md" file should exist
+    When I run jekyll build --source test_blank --destination test_blank/_site
+    Then I should get a zero exit status
+    And the test_blank/_site directory should exist
+    And I should see "Start developing" in "test_blank/_site/index.html"
+    And I should see "body {" in "test_blank/_site/assets/css/main.css"
 
   Scenario: Basic site
     Given I have an "index.html" file that contains "Basic Site"
diff --git a/lib/blank_template/_sass/main.scss b/lib/blank_template/_sass/base.scss
similarity index 100%
rename from lib/blank_template/_sass/main.scss
rename to lib/blank_template/_sass/base.scss
diff --git a/lib/blank_template/assets/css/main.scss b/lib/blank_template/assets/css/main.scss
index 9f4189446dd..9c288c5ce5a 100644
--- a/lib/blank_template/assets/css/main.scss
+++ b/lib/blank_template/assets/css/main.scss
@@ -1,4 +1,4 @@
 ---
 ---
 
-@import "main";
+@import "base";

From 2aa2861a5d904d0ab80827ad859c8b643af4941b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 18 Jan 2023 23:00:25 -0800
Subject: [PATCH 167/290] Update history to reflect merge of #9257 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 06fdeadc4f7..6f8da20b67d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Optimize default front matter using `File.fnmatch?` (#9185)
   * Remove totals in profile table properly (#9186)
   * Optimize `Site#each_site_file` (#9187)
+  * Rename sass partial created for new blank site (#9257)
 
 ## 4.3.1 / 2022-10-26
 

From bf8d50ee085be56fde9f1f5fbebc406496f1b120 Mon Sep 17 00:00:00 2001
From: Parker Moore <237985+parkr@users.noreply.github.com>
Date: Wed, 18 Jan 2023 23:05:39 -0800
Subject: [PATCH 168/290] script/default-site: accept flags for `jekyll new`
 (#9259)

Merge pull request 9259
---
 script/default-site | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/script/default-site b/script/default-site
index 0504fd3815e..7f56c908bd4 100755
--- a/script/default-site
+++ b/script/default-site
@@ -1,15 +1,18 @@
 #!/usr/bin/env bash
 # Runs the `jekyll new` command and builds the default site as a sanity check
+# Additional flags for `jekyll new` may be passed to this script.
 
 set -e
 
+TMP_SOURCE="tmp/default-site"
+
 echo "$0: setting up tmp directory"
 mkdir -p ./tmp
-rm -Rf ./tmp/default-site
+rm -Rf "./$TMP_SOURCE"
 
 echo "$0: creating new default site"
-bundle exec jekyll new tmp/default-site
-pushd tmp/default-site
+bundle exec jekyll new "$TMP_SOURCE" "$@"
+pushd "$TMP_SOURCE"
 
 echo "$0: respecifying the jekyll install location"
 ruby -e "contents = File.read('Gemfile'); File.write('Gemfile', contents.sub(/gem \"jekyll\".*\\n/, 'gem \"jekyll\", path: \"../../\"'))"

From 99a1b724931ce6db1c9ff126d86602898a937613 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 18 Jan 2023 23:05:42 -0800
Subject: [PATCH 169/290] Update history to reflect merge of #9259 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 6f8da20b67d..cb2363b2e73 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
   * Update sass related tests for jekyll-sass-converter 3.x (#9223)
   * Split `test/test_tags.rb` into multiple files (#9230)
   * test: use hash explicitly for Struct initializer for ruby 3.2 (#9237)
+  * script/default-site: accept flags for `jekyll new` (#9259)
 
 ### Bug Fixes
 

From c7e3e689e7c9f50f7d5fa165a310a105d353fb4d Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 20 Jan 2023 23:43:04 +0530
Subject: [PATCH 170/290] Add release post for v4.3.2 (#9263)

Merge pull request 9263
---
 .../2023-01-20-jekyll-4-3-2-released.markdown | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 docs/_posts/2023-01-20-jekyll-4-3-2-released.markdown

diff --git a/docs/_posts/2023-01-20-jekyll-4-3-2-released.markdown b/docs/_posts/2023-01-20-jekyll-4-3-2-released.markdown
new file mode 100644
index 00000000000..cfc69ee4fc2
--- /dev/null
+++ b/docs/_posts/2023-01-20-jekyll-4-3-2-released.markdown
@@ -0,0 +1,27 @@
+---
+title: 'Jekyll 4.3.2 Released'
+date: 2023-01-20 23:00:00 +0530
+author: ashmaroli
+version: 4.3.2
+category: release
+---
+
+Hello Jekyllers!
+
+This is a small release containing fixes for some issues that came to our attention after the
+release of v4.3.1:
+  - Our `link` tag had a significant performance regression with the release of v4.3.0 solely due
+    to a change related to `Jekyll::Site#each_site_file`. The new patch restores previous performance
+    while maintaining the enhancements introduced in v4.3.0.
+  - The tables printed out on running a build with the `--profile` did not stop including the
+    misleading `TOTALS` row as advertised in the release-notes for v4.3.0. The row has been removed
+    completely now.
+  - `jekyll-sass-converter-3.0.0` that shipped in the interim was not happy with our blank-site
+    scaffolding (from running `jekyll new  --blank`) having a `main.scss` stylesheet template
+    *import* a Sass partial *also named* `main.scss`. So the partial has been renamed to `base.scss`.
+
+That's about it for this release. Depending on whether you use the features patched in this release,
+you may either wait for v4.4.0 (releasing in the near future) to update your Gemfile or, download
+the latest release right away! :)
+
+Happy Jekyllin'!!

From 03db5267a31fd7b115ec0bd50116122fa8117a00 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 20 Jan 2023 10:13:06 -0800
Subject: [PATCH 171/290] Update history to reflect merge of #9263 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index cb2363b2e73..d0cb6067365 100644
--- a/History.markdown
+++ b/History.markdown
@@ -10,6 +10,7 @@
   * Fix typo on website (#9203)
   * Publish post on major release of sass-converter (#9225)
   * Update Jekyll on macOS (macos.md) and current ruby version to 3.1.3 in ruby.yml (#9195)
+  * Add release post for v4.3.2 (#9263)
 
 ### Development Fixes
 

From ff60d51c9b59d3bb5cc89f6a4f493602b42c5cac Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 20 Jan 2023 23:53:30 +0530
Subject: [PATCH 172/290] Release :gem: v4.3.2

---
 History.markdown        | 13 +++++++++++++
 docs/_config.yml        |  2 +-
 docs/_docs/history.md   | 16 ++++++++++++++++
 docs/latest_version.txt |  2 +-
 lib/jekyll/version.rb   |  2 +-
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/History.markdown b/History.markdown
index d0cb6067365..dfd7e1f02c8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,19 @@
   * Optimize `Site#each_site_file` (#9187)
   * Rename sass partial created for new blank site (#9257)
 
+## 4.3.2 / 2023-01-20
+
+  * Optimize default front matter using `File.fnmatch?` (#9185)
+  * Remove totals in profile table properly (#9186)
+  * Optimize `Site#each_site_file` (#9187)
+  * Rename sass partial created for new blank site (#9257)
+
+### Bug Fixes
+
+  * Backport #9257 for v4.3.x: Rename sass partial created for new blank site (#9262)
+  * Backport #9187 for v4.3.x: Optimize `Site#each_site_file` (#9256)
+  * Backport #9186 for v4.3.x: Remove totals in profile table properly (#9255)
+
 ## 4.3.1 / 2022-10-26
 
 ### Bug Fixes
diff --git a/docs/_config.yml b/docs/_config.yml
index 74a9914eb56..4c32125e1f0 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,5 +1,5 @@
 ---
-version: 4.3.1
+version: 4.3.2
 name: Jekyll • Simple, blog-aware, static sites
 description: Transform your plain text into static websites and blogs
 url: https://jekyllrb.com
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 1700c17bc37..3bed8dd8b21 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,22 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 4.3.2 / 2023-01-20
+{: #v4-3-2}
+
+- Optimize default front matter using `File.fnmatch?` ([#9185]({{ site.repository }}/issues/9185))
+- Remove totals in profile table properly ([#9186]({{ site.repository }}/issues/9186))
+- Optimize `Site#each_site_file` ([#9187]({{ site.repository }}/issues/9187))
+- Rename sass partial created for new blank site ([#9257]({{ site.repository }}/issues/9257))
+
+### Bug Fixes
+{: #bug-fixes-v4-3-2}
+
+- Backport [#9257]({{ site.repository }}/issues/9257) for v4.3.x: Rename sass partial created for new blank site ([#9262]({{ site.repository }}/issues/9262))
+- Backport [#9187]({{ site.repository }}/issues/9187) for v4.3.x: Optimize `Site#each_site_file` ([#9256]({{ site.repository }}/issues/9256))
+- Backport [#9186]({{ site.repository }}/issues/9186) for v4.3.x: Remove totals in profile table properly ([#9255]({{ site.repository }}/issues/9255))
+
+
 ## 4.3.1 / 2022-10-26
 {: #v4-3-1}
 
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index f77856a6f1a..cc2fbe89b6c 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-4.3.1
+4.3.2
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 525f4c6fe8f..73909f4a523 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "4.3.1"
+  VERSION = "4.3.2"
 end

From 67ab1be220c4b9fe13849911058d2335dc2f8c0a Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 25 Jan 2023 19:24:20 +0530
Subject: [PATCH 173/290] Fix History entry for v4.3.2

---
 History.markdown      |  9 ++++-----
 docs/_docs/history.md | 10 +++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/History.markdown b/History.markdown
index dfd7e1f02c8..32dd6f02ef3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -31,17 +31,16 @@
 
 ## 4.3.2 / 2023-01-20
 
-  * Optimize default front matter using `File.fnmatch?` (#9185)
-  * Remove totals in profile table properly (#9186)
-  * Optimize `Site#each_site_file` (#9187)
-  * Rename sass partial created for new blank site (#9257)
-
 ### Bug Fixes
 
   * Backport #9257 for v4.3.x: Rename sass partial created for new blank site (#9262)
   * Backport #9187 for v4.3.x: Optimize `Site#each_site_file` (#9256)
   * Backport #9186 for v4.3.x: Remove totals in profile table properly (#9255)
 
+### Development Fixes
+
+  * Backport #9223 for 4.3.x: Update sass related tests for jekyll-sass-converter 3.x (#9254)
+
 ## 4.3.1 / 2022-10-26
 
 ### Bug Fixes
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 3bed8dd8b21..63d462cbbfd 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -7,11 +7,6 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ## 4.3.2 / 2023-01-20
 {: #v4-3-2}
 
-- Optimize default front matter using `File.fnmatch?` ([#9185]({{ site.repository }}/issues/9185))
-- Remove totals in profile table properly ([#9186]({{ site.repository }}/issues/9186))
-- Optimize `Site#each_site_file` ([#9187]({{ site.repository }}/issues/9187))
-- Rename sass partial created for new blank site ([#9257]({{ site.repository }}/issues/9257))
-
 ### Bug Fixes
 {: #bug-fixes-v4-3-2}
 
@@ -19,6 +14,11 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Backport [#9187]({{ site.repository }}/issues/9187) for v4.3.x: Optimize `Site#each_site_file` ([#9256]({{ site.repository }}/issues/9256))
 - Backport [#9186]({{ site.repository }}/issues/9186) for v4.3.x: Remove totals in profile table properly ([#9255]({{ site.repository }}/issues/9255))
 
+### Development Fixes
+{: #development-fixes-v4-3-2}
+
+- Backport [#9223]({{ site.repository }}/issues/9223) for 4.3.x: Update sass related tests for jekyll-sass-converter 3.x ([#9254]({{ site.repository }}/issues/9254))
+
 
 ## 4.3.1 / 2022-10-26
 {: #v4-3-1}

From 0da02acdf8775d1b6cf241d78597184cae958f8b Mon Sep 17 00:00:00 2001
From: plgagne 
Date: Thu, 26 Jan 2023 05:54:09 -0500
Subject: [PATCH 174/290] grammatical reordering (#9245)

Merge pull request 9245
---
 docs/_docs/upgrading/3-to-4.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/upgrading/3-to-4.md b/docs/_docs/upgrading/3-to-4.md
index 87ad8acb3c6..3d03968fd40 100644
--- a/docs/_docs/upgrading/3-to-4.md
+++ b/docs/_docs/upgrading/3-to-4.md
@@ -123,7 +123,7 @@ Jekyll has dropped support for `kramdown-1.x` entirely.
 
 From [`v2.0` onwards](https://kramdown.gettalong.org/news.html#kramdown-200-released)
 kramdown requires specific extensions to be additionally installed to use
-certain features are desired outside of kramdown's core functionality.
+certain desired features outside of kramdown's core functionality.
 
 Out of all the extensions listed in the report linked above, gem
 `kramdown-parser-gfm` is automatically installed along with Jekyll 4.0. The

From bf13d8dfbc5979dda9950770c47a3a88fd9a951f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 26 Jan 2023 02:54:11 -0800
Subject: [PATCH 175/290] Update history to reflect merge of #9245 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 32dd6f02ef3..3805e681171 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,7 @@
   * Publish post on major release of sass-converter (#9225)
   * Update Jekyll on macOS (macos.md) and current ruby version to 3.1.3 in ruby.yml (#9195)
   * Add release post for v4.3.2 (#9263)
+  * Grammatical reordering in  3-to-4 upgrading docs (#9245)
 
 ### Development Fixes
 

From 2bd91fdd8c649db240c3ca75619bc5453c6e2b5b Mon Sep 17 00:00:00 2001
From: William Underwood <42812654+WGUNDERWOOD@users.noreply.github.com>
Date: Thu, 26 Jan 2023 05:55:35 -0500
Subject: [PATCH 176/290] fixed grammatical mistake on "showcase" page (#9264)

Merge pull request 9264
---
 docs/pages/showcase.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pages/showcase.html b/docs/pages/showcase.html
index 53f82815f0b..61c2d6d7472 100644
--- a/docs/pages/showcase.html
+++ b/docs/pages/showcase.html
@@ -6,7 +6,7 @@
   - /docs/sites/
 ---
 
-
    Jekyll powers many company websites, here a few nice ones:
    
+
    Jekyll powers many company websites; here are a few nice ones:
    
 
 
      
   {% for entry in site.data.showcase reversed -%}

From 583da3491feb486325acebaae3f44988bf24fa21 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 26 Jan 2023 02:55:37 -0800
Subject: [PATCH 177/290] Update history to reflect merge of #9264 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 3805e681171..3fda008941a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,7 @@
   * Update Jekyll on macOS (macos.md) and current ruby version to 3.1.3 in ruby.yml (#9195)
   * Add release post for v4.3.2 (#9263)
   * Grammatical reordering in  3-to-4 upgrading docs (#9245)
+  * fixed grammatical mistake on "showcase" page (#9264)
 
 ### Development Fixes
 

From e793a96bda5210243ad54305803ce6b2f1eb6e48 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 27 Jan 2023 20:05:37 +0530
Subject: [PATCH 178/290] Clean up AppVeyor config

[skip ci]
---
 appveyor.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 8c0d372d2e0..d37c277bbf6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
 version: "{build}"
-
 image: Visual Studio 2019
+build: off
 
 clone_depth: 5
 
@@ -8,9 +8,7 @@ branches:
   only:
     - master
     - themes
-    - /.*-stable/
-
-build: off
+    - /.*-stable$/
 
 environment:
   BUNDLE_WITHOUT: "benchmark:development"
@@ -36,7 +34,9 @@ environment:
 
 install:
   - SET PATH=C:\Ruby%RUBY_FOLDER_VER%-x64\bin;%PATH%
-  - bundle install --retry 5 --jobs=%NUMBER_OF_PROCESSORS% --clean --path vendor\bundle
+  - bundle config set --local clean 'true'
+  - bundle config set --local path 'vendor\bundle'
+  - bundle install --retry 5 --jobs=%NUMBER_OF_PROCESSORS%
 
 test_script:
   - ruby --version

From ef62f7455cad1ffc88e9d6786aaa3ed9a83f836c Mon Sep 17 00:00:00 2001
From: Andy Coates <8012398+big-andy-coates@users.noreply.github.com>
Date: Fri, 27 Jan 2023 15:24:26 +0000
Subject: [PATCH 179/290] Mark `highlight` `mark_lines` feature as 4.4 in docs
 (#9184)

Merge pull request 9184
---
 docs/_docs/liquid/tags.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/liquid/tags.md b/docs/_docs/liquid/tags.md
index ebc7a815a05..227aba496df 100644
--- a/docs/_docs/liquid/tags.md
+++ b/docs/_docs/liquid/tags.md
@@ -66,7 +66,8 @@ end
 ```
 {% endraw %}
 
-### Marking specific lines
+### Marking specific lines {%- include docs_version_badge.html version="4.4.0" -%}
+{: #marking-specific-lines }
 
 You can mark specific lines in a code snippet by using the optional
 argument `mark_lines`. This argument takes a space-separated list of

From 87dd43e654e5c051ffe4cf92b19c5ab16504873a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 27 Jan 2023 07:24:29 -0800
Subject: [PATCH 180/290] Update history to reflect merge of #9184 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 3fda008941a..d4b587ec42d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -13,6 +13,7 @@
   * Add release post for v4.3.2 (#9263)
   * Grammatical reordering in  3-to-4 upgrading docs (#9245)
   * fixed grammatical mistake on "showcase" page (#9264)
+  * Mark `highlight` `mark_lines` feature as 4.4 in docs (#9184)
 
 ### Development Fixes
 

From 2b590254a151fe37aaf7ef99ccfd1f1b1820f4aa Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 29 Jan 2023 21:01:59 +0530
Subject: [PATCH 181/290] Test with Ruby 3.2

---
 .github/workflows/ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index db9e53d8a8d..34458c90914 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,8 +22,10 @@ jobs:
             ruby_version: "2.7"
           - label: Ruby 3.0
             ruby_version: "3.0"
-          - label: Ruby 3.1.2
-            ruby_version: "3.1.2"
+          - label: Ruby 3.1
+            ruby_version: "3.1"
+          - label: Ruby 3.2
+            ruby_version: "3.2"
           - label: JRuby 9.4.0.0
             ruby_version: "jruby-9.4.0.0"
     steps:

From ac4abbd14d59ae1a120cc87a161acb5d9987f05b Mon Sep 17 00:00:00 2001
From: Parker Moore <237985+parkr@users.noreply.github.com>
Date: Mon, 30 Jan 2023 01:41:28 -0800
Subject: [PATCH 182/290] Add v3.9.3 release history & post to `master` branch
 (#9284)

Merge pull request 9284
---
 History.markdown                                | 13 +++++++++++++
 docs/_docs/history.md                           | 17 +++++++++++++++++
 .../2023-01-29-jekyll-3-9-3-released.markdown   | 15 +++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 docs/_posts/2023-01-29-jekyll-3-9-3-released.markdown

diff --git a/History.markdown b/History.markdown
index d4b587ec42d..bf67e30ec7e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -32,6 +32,19 @@
   * Optimize `Site#each_site_file` (#9187)
   * Rename sass partial created for new blank site (#9257)
 
+## 3.9.3 / 2023-01-29
+
+### Bug Fixes
+
+  * 3.9.x: Support i18n 1.x (#9269)
+  * Backport #8880 for v3.9.x: Support both tzinfo v1 and v2 along with
+    non-half hour offsets (#9280)
+
+### Development Fixes
+
+  * v3.9.x: test under Ruby 3.2 #9272)
+  * v3.9.x: fix rdiscount test (#9277)
+
 ## 4.3.2 / 2023-01-20
 
 ### Bug Fixes
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 63d462cbbfd..40137d680b5 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,23 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.9.3 / 2023-01-29
+{: #v3-9-3}
+
+### Bug Fixes
+{: #bug-fixes-v3-9-3}
+
+- 3.9.x: Support i18n 1.x ([#9269]({{ site.repository }}/issues/9269))
+- Backport [#8880]({{ site.repository }}/issues/8880) for v3.9.x: Support both tzinfo v1 and v2 along with
+    non-half hour offsets ([#9280]({{ site.repository }}/issues/9280))
+
+### Development Fixes
+{: #development-fixes-v3-9-3}
+
+- v3.9.x: test under Ruby 3.2 [#9272]({{ site.repository }}/issues/9272))
+- v3.9.x: fix rdiscount test ([#9277]({{ site.repository }}/issues/9277))
+
+
 ## 4.3.2 / 2023-01-20
 {: #v4-3-2}
 
diff --git a/docs/_posts/2023-01-29-jekyll-3-9-3-released.markdown b/docs/_posts/2023-01-29-jekyll-3-9-3-released.markdown
new file mode 100644
index 00000000000..71177fb55aa
--- /dev/null
+++ b/docs/_posts/2023-01-29-jekyll-3-9-3-released.markdown
@@ -0,0 +1,15 @@
+---
+title: 'Jekyll 3.9.3 Released'
+date: 2023-01-29 18:30:22 2023 -0800
+author: parkr
+version: 3.9.3
+categories: [release]
+---
+
+Jekyll 3.9.3 is a bug fix release loosening version restrictions for
+dependencies `i18n` and `tzinfo` gems. You can now use Jekyll v3.9 with
+newer versions of these gems!
+
+More details in [the full release notes]({% link _docs/history.md %}#v3-9-3).
+
+Happy Jekylling!

From e90fa179d4bc9b5c7d4438b0cecd3d24e5978718 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 30 Jan 2023 01:41:30 -0800
Subject: [PATCH 183/290] Update history to reflect merge of #9284 [ci skip]

---
 History.markdown | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/History.markdown b/History.markdown
index bf67e30ec7e..058c7e411bc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -14,6 +14,7 @@
   * Grammatical reordering in  3-to-4 upgrading docs (#9245)
   * fixed grammatical mistake on "showcase" page (#9264)
   * Mark `highlight` `mark_lines` feature as 4.4 in docs (#9184)
+  * Add v3.9.3 release history & post to `master` branch (#9284)
 
 ### Development Fixes
 
@@ -38,6 +39,7 @@
 
   * 3.9.x: Support i18n 1.x (#9269)
   * Backport #8880 for v3.9.x: Support both tzinfo v1 and v2 along with
+
     non-half hour offsets (#9280)
 
 ### Development Fixes

From e0cd941c09c040184a8cbe679c38e5c49f5c4a6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jan 2023 09:49:55 -0800
Subject: [PATCH 184/290] Bump check-spelling/check-spelling from 0.0.20 to
 0.0.21 (#9205)

Merge pull request 9205
---
 .github/workflows/spelling.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
index 91849de868a..08c0adecd16 100644
--- a/.github/workflows/spelling.yml
+++ b/.github/workflows/spelling.yml
@@ -29,7 +29,7 @@ jobs:
     steps:
     - name: check-spelling
       id: spelling
-      uses: check-spelling/check-spelling@v0.0.20
+      uses: check-spelling/check-spelling@v0.0.21
       with:
         # This workflow runs in response to both `push` and `pull_request`, if there's an open `pull_request` in the same repository for a given branch, there's no reason to spend resources checking both the `push` and the `pull_request`, so this flag tells the action while running for the `push` to find the `pull_request` and stop working early:
         suppress_push_for_open_pull_request: 1

From c4af6efca93f349ece81c26200a9fab3776e125a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 30 Jan 2023 09:49:57 -0800
Subject: [PATCH 185/290] Update history to reflect merge of #9205 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 058c7e411bc..b087480c4f5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Split `test/test_tags.rb` into multiple files (#9230)
   * test: use hash explicitly for Struct initializer for ruby 3.2 (#9237)
   * script/default-site: accept flags for `jekyll new` (#9259)
+  * Bump check-spelling/check-spelling from 0.0.20 to 0.0.21 (#9205)
 
 ### Bug Fixes
 

From 4cc1905ae346459c8bc669f6a33255edbc76b721 Mon Sep 17 00:00:00 2001
From: "Sean M. Collins" 
Date: Wed, 1 Feb 2023 08:30:07 -0500
Subject: [PATCH 186/290] Update S3 deployment to remove s3_website (#9221)

Merge pull request 9221
---
 docs/_docs/deployment/manual.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/docs/_docs/deployment/manual.md b/docs/_docs/deployment/manual.md
index b0805c16851..ed13b214fcc 100644
--- a/docs/_docs/deployment/manual.md
+++ b/docs/_docs/deployment/manual.md
@@ -16,12 +16,10 @@ rsync in the [Digital Ocean tutorial](https://www.digitalocean.com/community/tut
 ## Amazon S3
 
 If you want to host your site in Amazon S3, you can do so by
-using the [s3_website](https://github.com/laurilehmijoki/s3_website)
-application. It will push your site to Amazon S3 where it can be served like
-any web server,
-dynamically scaling to almost unlimited traffic. This approach has the
-benefit of being about the cheapest hosting option available for
-low-volume blogs as you only pay for what you use.
+using the AWS cli client and pushing your rendered `_site` directory directly to
+your S3 bucket.
+
+`aws s3 sync _site s3://.com --size-only --storage-class REDUCED_REDUNDANCY`
 
 ## FTP
 

From c0ad3ac41e9ae09e48deaa971902191726a43bc2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 1 Feb 2023 05:30:10 -0800
Subject: [PATCH 187/290] Update history to reflect merge of #9221 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index b087480c4f5..acf14e7e791 100644
--- a/History.markdown
+++ b/History.markdown
@@ -15,6 +15,7 @@
   * fixed grammatical mistake on "showcase" page (#9264)
   * Mark `highlight` `mark_lines` feature as 4.4 in docs (#9184)
   * Add v3.9.3 release history & post to `master` branch (#9284)
+  * Update S3 deployment to remove s3_website (#9221)
 
 ### Development Fixes
 

From 7047e7dfb47d8a094478e266ad27bad35ec9eb72 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Wed, 1 Feb 2023 08:37:05 -0500
Subject: [PATCH 188/290] Use check-spelling/check-spelling@v0.0.21 (#9199)

Merge pull request 9199
---
 .github/CONTRIBUTING.markdown                 |   2 +-
 .github/actions/spelling/README.md            |   8 +-
 .github/actions/spelling/advice.md            |  31 +-
 .github/actions/spelling/allow.txt            |  18 +-
 .github/actions/spelling/candidate.patterns   | 520 ++++++++++++++++++
 .github/actions/spelling/excludes.txt         |  39 +-
 .github/actions/spelling/expect.txt           |  21 +-
 .../actions/spelling/line_forbidden.patterns  |  62 +++
 .github/actions/spelling/patterns.txt         |  86 +++
 .github/actions/spelling/reject.txt           |  11 +-
 .github/workflows/spelling.yml                |  57 ++
 docs/_docs/continuous-integration/razorops.md |   2 +-
 docs/_docs/contributing.md                    |   2 +-
 docs/_docs/history.md                         |   8 +-
 docs/_docs/maintaining/triaging-an-issue.md   |   2 +-
 docs/_docs/troubleshooting.md                 |   2 +-
 docs/pages/resources.md                       |   2 +-
 lib/jekyll/commands/doctor.rb                 |   2 +-
 18 files changed, 830 insertions(+), 45 deletions(-)
 create mode 100644 .github/actions/spelling/candidate.patterns
 create mode 100644 .github/actions/spelling/line_forbidden.patterns

diff --git a/.github/CONTRIBUTING.markdown b/.github/CONTRIBUTING.markdown
index 3ae6c74bb90..68a41c87338 100644
--- a/.github/CONTRIBUTING.markdown
+++ b/.github/CONTRIBUTING.markdown
@@ -11,7 +11,7 @@ See the [support guidelines](https://jekyllrb.com/docs/support/)
 Whether you're a developer, a designer, or just a Jekyll devotee, there are lots of ways to contribute. Here's a few ideas:
 
 - [Install Jekyll on your computer](https://jekyllrb.com/docs/installation/) and kick the tires. Does it work? Does it do what you'd expect? If not, [open an issue](https://github.com/jekyll/jekyll/issues/new) and let us know.
-- Comment on some of the project's [open issues](https://github.com/jekyll/jekyll/issues). Have you experienced the same problem? Know a work around? Do you have a suggestion for how the feature could be better?
+- Comment on some of the project's [open issues](https://github.com/jekyll/jekyll/issues). Have you experienced the same problem? Know a workaround? Do you have a suggestion for how the feature could be better?
 - Read through the [documentation](https://jekyllrb.com/docs/home/), and click the "improve this page" button, any time you see something confusing, or have a suggestion for something that could be improved.
 - Browse through the [Jekyll discussion forum](https://talk.jekyllrb.com/), and lend a hand answering questions. There's a good chance you've already experienced what another user is experiencing.
 - Find an [open issue](https://github.com/jekyll/jekyll/issues) (especially [those labeled `help-wanted`](https://github.com/jekyll/jekyll/issues?q=is%3Aopen+is%3Aissue+label%3Ahelp-wanted)), and submit a proposed fix. If it's your first pull request, we promise we won't bite, and are glad to answer any questions.
diff --git a/.github/actions/spelling/README.md b/.github/actions/spelling/README.md
index 71d377ce726..1f699f3de3d 100644
--- a/.github/actions/spelling/README.md
+++ b/.github/actions/spelling/README.md
@@ -8,8 +8,10 @@ File | Purpose | Format | Info
 [excludes.txt](excludes.txt) | Files to ignore entirely | perl regular expression | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes)
 [only.txt](only.txt) | Only check matching files (applied after excludes) | perl regular expression | [only](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-only)
 [patterns.txt](patterns.txt) | Patterns to ignore from checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
+[candidate.patterns](candidate.patterns) | Patterns that might be worth adding to [patterns.txt](patterns.txt) | perl regular expression with optional comment block introductions (all matches will be suggested) | [candidates](https://github.com/check-spelling/check-spelling/wiki/Feature:-Suggest-patterns)
+[line_forbidden.patterns](line_forbidden.patterns) | Patterns to flag in checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
 [expect.txt](expect.txt) | Expected words that aren't in the dictionary | one word per line (sorted, alphabetically) | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)
-[advice.txt](advice.txt) | Supplement for GitHub comment when unrecognized words are found | GitHub Markdown | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)
+[advice.md](advice.md) | Supplement for GitHub comment when unrecognized words are found | GitHub Markdown | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)
 
-Note: you can replace any of these files with a directory by the same name (minus the `.txt` extension) and
-then include multiple files (with a `.txt` extension) inside that directory to merge multiple files together.
+Note: you can replace any of these files with a directory by the same name (minus the suffix)
+and then include multiple files inside that directory (with that suffix) to merge multiple files together.
diff --git a/.github/actions/spelling/advice.md b/.github/actions/spelling/advice.md
index 5cde8ef25cf..1004eeaa604 100644
--- a/.github/actions/spelling/advice.md
+++ b/.github/actions/spelling/advice.md
@@ -1,28 +1,25 @@
  
+
      If the flagged items are :exploding_head: false positives
 
-
      If you see a bunch of garbage
+If items relate to a ...
+* binary file (or some other file you wouldn't want to check at all).
 
-If it relates to a ...
-
      well-formed pattern
+  Please add a file path to the `excludes.txt` file matching the containing file.
 
-See if there's a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it.
-
-If not, try writing one and adding it to the `patterns.txt` file.
+  File paths are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
 
-Patterns are Perl 5 Regular Expressions - you can [test](
-https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
+  `^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
+../tree/HEAD/README.md) (on whichever branch you're using).
 
-Note that patterns can't match multiline strings.
-
      
-
      binary-ish string
+* well-formed pattern.
 
-Please add a file path to the `excludes.txt` file instead of just accepting the garbage.
+  If you can write a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it,
+  try adding it to the `patterns.txt` file.
 
-File paths are Perl 5 Regular Expressions - you can [test](
-https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
+  Patterns are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
 
-`^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
-../tree/HEAD/README.md) (on whichever branch you're using).
-
      
+  Note that patterns can't match multiline strings.
 
 
      
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
index cb2757cc60b..3d1a3f2ac89 100644
--- a/.github/actions/spelling/allow.txt
+++ b/.github/actions/spelling/allow.txt
@@ -1,5 +1,15 @@
-statictastic
-Statictastic
-Linting
-hakiri
 built-ins
+github
+hakiri
+https
+Linting
+Microsoft
+ssh
+Statictastic
+statictastic
+ubuntu
+Wikipedia
+workaround
+workaround
+workarounds
+WSL
diff --git a/.github/actions/spelling/candidate.patterns b/.github/actions/spelling/candidate.patterns
new file mode 100644
index 00000000000..dc17f842fa8
--- /dev/null
+++ b/.github/actions/spelling/candidate.patterns
@@ -0,0 +1,520 @@
+# marker to ignore all code on line
+^.*/\* #no-spell-check-line \*/.*$
+# marker for ignoring a comment to the end of the line
+// #no-spell-check.*$
+
+# patch hunk comments
+^\@\@ -\d+(?:,\d+|) \+\d+(?:,\d+|) \@\@ .*
+# git index header
+index [0-9a-z]{7,40}\.\.[0-9a-z]{7,40}
+
+# cid urls
+(['"])cid:.*?\g{-1}
+
+# data url in parens
+\(data:[^)]*?(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})[^)]*\)
+# data url in quotes
+([`'"])data:.*?(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,}).*\g{-1}
+# data url
+data:[-a-zA-Z=;:/0-9+]*,\S*
+
+# mailto urls
+mailto:[-a-zA-Z=;:/?%&0-9+@.]{3,}
+
+# magnet urls
+magnet:[?=:\w]+
+
+# magnet urls
+"magnet:[^"]+"
+
+# obs:
+"obs:[^"]*"
+
+# The `\b` here means a break, it's the fancy way to handle urls, but it makes things harder to read
+# In this examples content, I'm using a number of different ways to match things to show various approaches
+# asciinema
+\basciinema\.org/a/[0-9a-zA-Z]+
+
+# apple
+\bdeveloper\.apple\.com/[-\w?=/]+
+# Apple music
+\bembed\.music\.apple\.com/fr/playlist/usr-share/[-\w.]+
+
+# appveyor api
+\bci\.appveyor\.com/api/projects/status/[0-9a-z]+
+# appveyor project
+\bci\.appveyor\.com/project/(?:[^/\s"]*/){2}builds?/\d+/job/[0-9a-z]+
+
+# Amazon
+
+# Amazon
+\bamazon\.com/[-\w]+/(?:dp/[0-9A-Z]+|)
+# AWS S3
+\b\w*\.s3[^.]*\.amazonaws\.com/[-\w/&#%_?:=]*
+# AWS execute-api
+\b[0-9a-z]{10}\.execute-api\.[-0-9a-z]+\.amazonaws\.com\b
+# AWS ELB
+\b\w+\.[-0-9a-z]+\.elb\.amazonaws\.com\b
+# AWS SNS
+\bsns\.[-0-9a-z]+.amazonaws\.com/[-\w/&#%_?:=]*
+# AWS VPC
+vpc-\w+
+
+# While you could try to match `http://` and `https://` by using `s?` in `https?://`, sometimes there
+# YouTube url
+\b(?:(?:www\.|)youtube\.com|youtu.be)/(?:channel/|embed/|user/|playlist\?list=|watch\?v=|v/|)[-a-zA-Z0-9?&=_%]*
+# YouTube music
+\bmusic\.youtube\.com/youtubei/v1/browse(?:[?&]\w+=[-a-zA-Z0-9?&=_]*)
+# YouTube tag
+<\s*youtube\s+id=['"][-a-zA-Z0-9?_]*['"]
+# YouTube image
+\bimg\.youtube\.com/vi/[-a-zA-Z0-9?&=_]*
+# Google Accounts
+\baccounts.google.com/[-_/?=.:;+%&0-9a-zA-Z]*
+# Google Analytics
+\bgoogle-analytics\.com/collect.[-0-9a-zA-Z?%=&_.~]*
+# Google APIs
+\bgoogleapis\.(?:com|dev)/[a-z]+/(?:v\d+/|)[a-z]+/[-@:./?=\w+|&]+
+# Google Storage
+\b[-a-zA-Z0-9.]*\bstorage\d*\.googleapis\.com(?:/\S*|)
+# Google Calendar
+\bcalendar\.google\.com/calendar(?:/u/\d+|)/embed\?src=[@./?=\w&%]+
+\w+\@group\.calendar\.google\.com\b
+# Google DataStudio
+\bdatastudio\.google\.com/(?:(?:c/|)u/\d+/|)(?:embed/|)(?:open|reporting|datasources|s)/[-0-9a-zA-Z]+(?:/page/[-0-9a-zA-Z]+|)
+# The leading `/` here is as opposed to the `\b` above
+# ... a short way to match `https://` or `http://` since most urls have one of those prefixes
+# Google Docs
+/docs\.google\.com/[a-z]+/(?:ccc\?key=\w+|(?:u/\d+|d/(?:e/|)[0-9a-zA-Z_-]+/)?(?:edit\?[-\w=#.]*|/\?[\w=&]*|))
+# Google Drive
+\bdrive\.google\.com/(?:file/d/|open)[-0-9a-zA-Z_?=]*
+# Google Groups
+\bgroups\.google\.com/(?:(?:forum/#!|d/)(?:msg|topics?|searchin)|a)/[^/\s"]+/[-a-zA-Z0-9$]+(?:/[-a-zA-Z0-9]+)*
+# Google Maps
+\bmaps\.google\.com/maps\?[\w&;=]*
+# Google themes
+themes\.googleusercontent\.com/static/fonts/[^/\s"]+/v\d+/[^.]+.
+# Google CDN
+\bclients2\.google(?:usercontent|)\.com[-0-9a-zA-Z/.]*
+# Goo.gl
+/goo\.gl/[a-zA-Z0-9]+
+# Google Chrome Store
+\bchrome\.google\.com/webstore/detail/[-\w]*(?:/\w*|)
+# Google Books
+\bgoogle\.(?:\w{2,4})/books(?:/\w+)*\?[-\w\d=&#.]*
+# Google Fonts
+\bfonts\.(?:googleapis|gstatic)\.com/[-/?=:;+&0-9a-zA-Z]*
+# Google Forms
+\bforms\.gle/\w+
+# Google Scholar
+\bscholar\.google\.com/citations\?user=[A-Za-z0-9_]+
+# Google Colab Research Drive
+\bcolab\.research\.google\.com/drive/[-0-9a-zA-Z_?=]*
+
+# GitHub SHAs (api)
+\bapi.github\.com/repos(?:/[^/\s"]+){3}/[0-9a-f]+\b
+# GitHub SHAs (markdown)
+(?:\[`?[0-9a-f]+`?\]\(https:/|)/(?:www\.|)github\.com(?:/[^/\s"]+){2,}(?:/[^/\s")]+)(?:[0-9a-f]+(?:[-0-9a-zA-Z/#.]*|)\b|)
+# GitHub SHAs
+\bgithub\.com(?:/[^/\s"]+){2}[@#][0-9a-f]+\b
+# GitHub wiki
+\bgithub\.com/(?:[^/]+/){2}wiki/(?:(?:[^/]+/|)_history|[^/]+(?:/_compare|)/[0-9a-f.]{40,})\b
+# githubusercontent
+/[-a-z0-9]+\.githubusercontent\.com/[-a-zA-Z0-9?&=_\/.]*
+# githubassets
+\bgithubassets.com/[0-9a-f]+(?:[-/\w.]+)
+# gist github
+\bgist\.github\.com/[^/\s"]+/[0-9a-f]+
+# git.io
+\bgit\.io/[0-9a-zA-Z]+
+# GitHub JSON
+"node_id": "[-a-zA-Z=;:/0-9+]*"
+# Contributor
+\[[^\]]+\]\(https://github\.com/[^/\s"]+\)
+# GHSA
+GHSA(?:-[0-9a-z]{4}){3}
+
+# GitLab commit
+\bgitlab\.[^/\s"]*/\S+/\S+/commit/[0-9a-f]{7,16}#[0-9a-f]{40}\b
+# GitLab merge requests
+\bgitlab\.[^/\s"]*/\S+/\S+/-/merge_requests/\d+/diffs#[0-9a-f]{40}\b
+# GitLab uploads
+\bgitlab\.[^/\s"]*/uploads/[-a-zA-Z=;:/0-9+]*
+# GitLab commits
+\bgitlab\.[^/\s"]*/(?:[^/\s"]+/){2}commits?/[0-9a-f]+\b
+
+# binanace
+accounts.binance.com/[a-z/]*oauth/authorize\?[-0-9a-zA-Z&%]*
+
+# bitbucket diff
+\bapi\.bitbucket\.org/\d+\.\d+/repositories/(?:[^/\s"]+/){2}diff(?:stat|)(?:/[^/\s"]+){2}:[0-9a-f]+
+# bitbucket repositories commits
+\bapi\.bitbucket\.org/\d+\.\d+/repositories/(?:[^/\s"]+/){2}commits?/[0-9a-f]+
+# bitbucket commits
+\bbitbucket\.org/(?:[^/\s"]+/){2}commits?/[0-9a-f]+
+
+# bit.ly
+\bbit\.ly/\w+
+
+# bitrise
+\bapp\.bitrise\.io/app/[0-9a-f]*/[\w.?=&]*
+
+# bootstrapcdn.com
+\bbootstrapcdn\.com/[-./\w]+
+
+# cdn.cloudflare.com
+\bcdnjs\.cloudflare\.com/[./\w]+
+
+# circleci
+\bcircleci\.com/gh(?:/[^/\s"]+){1,5}.[a-z]+\?[-0-9a-zA-Z=&]+
+
+# gitter
+\bgitter\.im(?:/[^/\s"]+){2}\?at=[0-9a-f]+
+
+# gravatar
+\bgravatar\.com/avatar/[0-9a-f]+
+
+# ibm
+[a-z.]*ibm\.com/[-_#=:%!?~.\\/\d\w]*
+
+# imgur
+\bimgur\.com/[^.]+
+
+# Internet Archive
+\barchive\.org/web/\d+/(?:[-\w.?,'/\\+&%$#_:]*)
+
+# discord
+/discord(?:app\.com|\.gg)/(?:invite/)?[a-zA-Z0-9]{7,}
+
+# Disqus
+\bdisqus\.com/[-\w/%.()!?&=_]*
+
+# medium link
+\blink\.medium\.com/[a-zA-Z0-9]+
+# medium
+\bmedium\.com/\@?[^/\s"]+/[-\w]+
+
+# microsoft
+\b(?:https?://|)(?:(?:download\.visualstudio|docs|msdn2?|research)\.microsoft|blogs\.msdn)\.com/[-_a-zA-Z0-9()=./%]*
+# powerbi
+\bapp\.powerbi\.com/reportEmbed/[^"' ]*
+# vs devops
+\bvisualstudio.com(?::443|)/[-\w/?=%&.]*
+# microsoft store
+\bmicrosoft\.com/store/apps/\w+
+
+# mvnrepository.com
+\bmvnrepository\.com/[-0-9a-z./]+
+
+# now.sh
+/[0-9a-z-.]+\.now\.sh\b
+
+# oracle
+\bdocs\.oracle\.com/[-0-9a-zA-Z./_?#&=]*
+
+# chromatic.com
+/\S+.chromatic.com\S*[")]
+
+# codacy
+\bapi\.codacy\.com/project/badge/Grade/[0-9a-f]+
+
+# compai
+\bcompai\.pub/v1/png/[0-9a-f]+
+
+# mailgun api
+\.api\.mailgun\.net/v3/domains/[0-9a-z]+\.mailgun.org/messages/[0-9a-zA-Z=@]*
+# mailgun
+\b[0-9a-z]+.mailgun.org
+
+# /message-id/
+/message-id/[-\w@./%]+
+
+# Reddit
+\breddit\.com/r/[/\w_]*
+
+# requestb.in
+\brequestb\.in/[0-9a-z]+
+
+# sched
+\b[a-z0-9]+\.sched\.com\b
+
+# Slack url
+slack://[a-zA-Z0-9?&=]+
+# Slack
+\bslack\.com/[-0-9a-zA-Z/_~?&=.]*
+# Slack edge
+\bslack-edge\.com/[-a-zA-Z0-9?&=%./]+
+# Slack images
+\bslack-imgs\.com/[-a-zA-Z0-9?&=%.]+
+
+# shields.io
+\bshields\.io/[-\w/%?=&.:+;,]*
+
+# stackexchange -- https://stackexchange.com/feeds/sites
+\b(?:askubuntu|serverfault|stack(?:exchange|overflow)|superuser).com/(?:questions/\w+/[-\w]+|a/)
+
+# Sentry
+[0-9a-f]{32}\@o\d+\.ingest\.sentry\.io\b
+
+# Twitter markdown
+\[\@[^[/\]:]*?\]\(https://twitter.com/[^/\s"')]*(?:/status/\d+(?:\?[-_0-9a-zA-Z&=]*|)|)\)
+# Twitter hashtag
+\btwitter\.com/hashtag/[\w?_=&]*
+# Twitter status
+\btwitter\.com/[^/\s"')]*(?:/status/\d+(?:\?[-_0-9a-zA-Z&=]*|)|)
+# Twitter profile images
+\btwimg\.com/profile_images/[_\w./]*
+# Twitter media
+\btwimg\.com/media/[-_\w./?=]*
+# Twitter link shortened
+\bt\.co/\w+
+
+# facebook
+\bfburl\.com/[0-9a-z_]+
+# facebook CDN
+\bfbcdn\.net/[\w/.,]*
+# facebook watch
+\bfb\.watch/[0-9A-Za-z]+
+
+# dropbox
+\bdropbox\.com/sh?/[^/\s"]+/[-0-9A-Za-z_.%?=&;]+
+
+# ipfs protocol
+ipfs://[0-9a-z]*
+# ipfs url
+/ipfs/[0-9a-z]*
+
+# w3
+\bw3\.org/[-0-9a-zA-Z/#.]+
+
+# loom
+\bloom\.com/embed/[0-9a-f]+
+
+# regex101
+\bregex101\.com/r/[^/\s"]+/\d+
+
+# figma
+\bfigma\.com/file(?:/[0-9a-zA-Z]+/)+
+
+# freecodecamp.org
+\bfreecodecamp\.org/[-\w/.]+
+
+# image.tmdb.org
+\bimage\.tmdb\.org/[/\w.]+
+
+# mermaid
+\bmermaid\.ink/img/[-\w]+|\bmermaid-js\.github\.io/mermaid-live-editor/#/edit/[-\w]+
+
+# Wikipedia
+\ben\.wikipedia\.org/wiki/[-\w%.#]+
+
+# gitweb
+[^"\s]+/gitweb/\S+;h=[0-9a-f]+
+
+# HyperKitty lists
+/archives/list/[^@/]+\@[^/\s"]*/message/[^/\s"]*/
+
+# lists
+/thread\.html/[^"\s]+
+
+# list-management
+\blist-manage\.com/subscribe(?:[?&](?:u|id)=[0-9a-f]+)+
+
+# kubectl.kubernetes.io/last-applied-configuration
+"kubectl.kubernetes.io/last-applied-configuration": ".*"
+
+# pgp
+\bgnupg\.net/pks/lookup[?&=0-9a-zA-Z]*
+
+# Spotify
+\bopen\.spotify\.com/embed/playlist/\w+
+
+# Mastodon
+\bmastodon\.[-a-z.]*/(?:media/|\@)[?&=0-9a-zA-Z_]*
+
+# scastie
+\bscastie\.scala-lang\.org/[^/]+/\w+
+
+# images.unsplash.com
+\bimages\.unsplash\.com/(?:(?:flagged|reserve)/|)[-\w./%?=%&.;]+
+
+# pastebin
+\bpastebin\.com/[\w/]+
+
+# heroku
+\b\w+\.heroku\.com/source/archive/\w+
+
+# quip
+\b\w+\.quip\.com/\w+(?:(?:#|/issues/)\w+)?
+
+# badgen.net
+\bbadgen\.net/badge/[^")\]'\s]+
+
+# statuspage.io
+\w+\.statuspage\.io\b
+
+# media.giphy.com
+\bmedia\.giphy\.com/media/[^/]+/[\w.?&=]+
+
+# tinyurl
+\btinyurl\.com/\w+
+
+# getopts
+\bgetopts\s+(?:"[^"]+"|'[^']+')
+
+# ANSI color codes
+(?:\\(?:u00|x)1b|\x1b)\[\d+(?:;\d+|)m
+
+# URL escaped characters
+\%[0-9A-F][A-F]
+# IPv6
+\b(?:[0-9a-fA-F]{0,4}:){3,7}[0-9a-fA-F]{0,4}\b
+# c99 hex digits (not the full format, just one I've seen)
+0x[0-9a-fA-F](?:\.[0-9a-fA-F]*|)[pP]
+# Punycode
+\bxn--[-0-9a-z]+
+# sha
+sha\d+:[0-9]*[a-f]{3,}[0-9a-f]*
+# sha-... -- uses a fancy capture
+(['"]|")[0-9a-f]{40,}\g{-1}
+# hex runs
+\b[0-9a-fA-F]{16,}\b
+# hex in url queries
+=[0-9a-fA-F]*?(?:[A-F]{3,}|[a-f]{3,})[0-9a-fA-F]*?&
+# ssh
+(?:ssh-\S+|-nistp256) [-a-zA-Z=;:/0-9+]{12,}
+
+# PGP
+\b(?:[0-9A-F]{4} ){9}[0-9A-F]{4}\b
+# GPG keys
+\b(?:[0-9A-F]{4} ){5}(?: [0-9A-F]{4}){5}\b
+# Well known gpg keys
+.well-known/openpgpkey/[\w./]+
+
+# uuid:
+\b[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}\b
+# hex digits including css/html color classes:
+(?:[\\0][xX]|\\u|[uU]\+|#x?|\%23)[0-9_a-fA-FgGrR]*?[a-fA-FgGrR]{2,}[0-9_a-fA-FgGrR]*(?:[uUlL]{0,3}|u\d+)\b
+# integrity
+integrity="sha\d+-[-a-zA-Z=;:/0-9+]{40,}"
+
+# https://www.gnu.org/software/groff/manual/groff.html
+# man troff content
+\\f[BCIPR]
+# '
+\\\(aq
+
+# .desktop mime types
+^MimeTypes?=.*$
+# .desktop localized entries
+^[A-Z][a-z]+\[[a-z]+\]=.*$
+# Localized .desktop content
+Name\[[^\]]+\]=.*
+
+# IServiceProvider
+\bI(?=(?:[A-Z][a-z]{2,})+\b)
+
+# crypt
+"\$2[ayb]\$.{56}"
+
+# scrypt / argon
+\$(?:scrypt|argon\d+[di]*)\$\S+
+
+# Input to GitHub JSON
+content: "[-a-zA-Z=;:/0-9+]*="
+
+# Python stringprefix / binaryprefix
+# Note that there's a high false positive rate, remove the `?=` and search for the regex to see if the matches seem like reasonable strings
+(?v#
+(?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
+# Compiler flags (Scala)
+(?:^|[\t ,>"'`=(])-J-[DPWXY](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
+# Compiler flags
+(?:^|[\t ,"'`=(])-[DPWXYLlf](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
+# Compiler flags (linker)
+,-B
+# curl arguments
+\b(?:\\n|)curl(?:\s+-[a-zA-Z]{1,2}\b)*(?:\s+-[a-zA-Z]{3,})(?:\s+-[a-zA-Z]+)*
+# set arguments
+\bset(?:\s+-[abefimouxE]{1,2})*\s+-[abefimouxE]{3,}(?:\s+-[abefimouxE]+)*
+# tar arguments
+\b(?:\\n|)g?tar(?:\.exe|)(?:(?:\s+--[-a-zA-Z]+|\s+-[a-zA-Z]+|\s[ABGJMOPRSUWZacdfh-pr-xz]+\b)(?:=[^ ]*|))+
+# tput arguments -- https://man7.org/linux/man-pages/man5/terminfo.5.html -- technically they can be more than 5 chars long...
+\btput\s+(?:(?:-[SV]|-T\s*\w+)\s+)*\w{3,5}\b
+# macOS temp folders
+/var/folders/\w\w/[+\w]+/(?:T|-Caches-)/
diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt
index 9b9ae8cd9bb..a340a91c70c 100644
--- a/.github/actions/spelling/excludes.txt
+++ b/.github/actions/spelling/excludes.txt
@@ -2,6 +2,8 @@
 
 (?:^|/)(?i)COPYRIGHT
 (?:^|/)(?i)LICEN[CS]E
+(?:^|/)3rdparty/
+(?:^|/)go\.sum$
 (?:^|/)package(?:-lock|)\.json$
 (?:^|/)vendor/
 
@@ -9,20 +11,52 @@
 ignore$
 
 \.avi$
+\.bmp$
+\.bz2$
+\.class$
+\.crt$
+\.dll$
+\.docx?$
+\.drawio$
+\.DS_Store$
 \.eot$
+\.exe$
+\.gif$
+\.gitattributes$
+\.graffle$
+\.gz$
+\.icns$
 \.ico$
+\.jar$
+\.jks$
 \.jpe?g$
+\.key$
+\.lib$
 \.lock$
 \.map$
-\.min\.
+\.min\..
 \.mod$
 \.mp[34]$
+\.o$
+\.ocf$
+\.otf$
+\.pdf$
+\.pem$
 \.png$
-\.svg$
+\.psd$
+\.pyc$
+\.s$
+\.svgz?$
+\.tar$
+\.tiff?$
 \.ttf$
 \.wav$
+\.webm$
+\.webp$
 \.woff$
 \.woff2$
+\.xlsx?$
+\.zip$
 
 ^docs/pages/redirects/github\.html$
 ^lib/jekyll/mime\.types$
@@ -33,3 +67,4 @@ ignore$
 ^test/fixtures/webrick/bar/foo\.xhtml$
 ^test/source/_posts/2009-06-22-no-yaml\.markdown$
 ^\.github/
+^\Q.github/workflows/spelling.yml\E$
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index 5738b15e033..5d2aca0580f 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -36,6 +36,7 @@ awscli
 backend
 backport
 backtick
+backticks
 barcamp
 baseurl
 bashrc
@@ -51,6 +52,7 @@ bitbucket
 blog
 Blogger
 blogging
+blogs
 bonafide
 Bou
 breadcrumbs
@@ -178,6 +180,7 @@ exe
 execjs
 extensionpack
 extname
+extnames
 exts
 favicon
 Fengyun
@@ -203,6 +206,7 @@ formx
 Forwardable
 frameborder
 freenode
+frontend
 frontmatter
 fsnotify
 ftp
@@ -376,6 +380,7 @@ mergable
 Mertcan
 mertkahyaoglu
 metadata
+metadatas
 microdata
 microsoft
 mimetype
@@ -421,6 +426,7 @@ nakanishi
 namespace
 namespaced
 navbar
+navbars
 nbsp
 nearlyfreespeech
 nethack
@@ -460,6 +466,7 @@ pathawks
 Pathutil
 paywall
 pdf
+PDFs
 Pelykh
 permalink
 PHP
@@ -480,6 +487,7 @@ Posterous
 postfiles
 postlayout
 postmodern
+prefetching
 preinstalled
 prepends
 Prioritise
@@ -510,6 +518,8 @@ redgreen
 redhat
 refactor
 refactoring
+refactorings
+Refactors
 Refheap
 regen
 regex
@@ -552,6 +562,7 @@ Schwartzian
 scp
 screenshot
 scrollbar
+scrollbars
 scroller
 scss
 scssify
@@ -565,9 +576,9 @@ setenv
 SFTP
 shingo
 shopify
-shortlog
 shortlinks
-shoulda
+shortlog
+Shoulda
 sieversii
 sigpipe
 simplecov
@@ -610,6 +621,7 @@ subdir
 subdomain
 subfolder
 subfolderitems
+subfolders
 subnav
 subpages
 subpath
@@ -649,6 +661,7 @@ throughs
 Tidelift
 timeago
 timezone
+timezones
 titleize
 TLS
 tmm
@@ -687,6 +700,7 @@ uri
 url
 urlset
 username
+usernames
 usr
 utf
 utils
@@ -728,6 +742,7 @@ woff
 wordpress
 Workaround
 workflow
+workflows
 wsl
 www
 xcode
@@ -758,5 +773,3 @@ Zsh
 zshrc
 zypper
 zzot
-frontend
-prefetching
diff --git a/.github/actions/spelling/line_forbidden.patterns b/.github/actions/spelling/line_forbidden.patterns
new file mode 100644
index 00000000000..31ad2ddcd26
--- /dev/null
+++ b/.github/actions/spelling/line_forbidden.patterns
@@ -0,0 +1,62 @@
+# reject `m_data` as there's a certain OS which has evil defines that break things if it's used elsewhere
+# \bm_data\b
+
+# If you have a framework that uses `it()` for testing and `fit()` for debugging a specific test,
+# you might not want to check in code where you were debugging w/ `fit()`, in which case, you might want
+# to use this:
+#\bfit\(
+
+# s.b. GitHub
+\bGithub\b
+
+# s.b. GitLab
+\bGitlab\b
+
+# s.b. JavaScript
+\bJavascript\b
+
+# s.b. Microsoft
+\bMicroSoft\b
+
+# s.b. another
+\ban[- ]other\b
+
+# s.b. greater than
+\bgreater then\b
+
+# s.b. into
+#\sin to\s
+
+# s.b. opt-in
+\sopt in\s
+
+# s.b. less than
+\bless then\b
+
+# s.b. otherwise
+\bother[- ]wise\b
+
+# s.b. nonexistent
+\bnon existing\b
+\b[Nn]o[nt][- ]existent\b
+
+# s.b. preexisting
+[Pp]re[- ]existing
+
+# s.b. preempt
+[Pp]re[- ]empt\b
+
+# s.b. preemptively
+[Pp]re[- ]emptively
+
+# s.b. reentrancy
+[Rr]e[- ]entrancy
+
+# s.b. reentrant
+[Rr]e[- ]entrant
+
+# s.b. workaround(s)
+#\bwork[- ]arounds?\b
+
+# Reject duplicate words
+\s([A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})\s\g{-1}\s
diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt
index 91e276a4f2d..53e41f97601 100644
--- a/.github/actions/spelling/patterns.txt
+++ b/.github/actions/spelling/patterns.txt
@@ -71,6 +71,92 @@ apiKey: '[a-f0-9]+'
 # hex digits including css/html color classes:
 (?:[\\0][xX]|\\u|[uU]\+|#x?|\%23)[0-9a-fA-FgGrR_]{2,}(?:[uU]?[lL]{0,2}|u\d+)\b
 
+# Automatically suggested patterns
+# hit-count: 23 file-count: 15
+# GitHub SHAs (markdown)
+(?:\[`?[0-9a-f]+`?\]\(https:/|)/(?:www\.|)github\.com(?:/[^/\s"]+){2,}(?:/[^/\s")]+)(?:[0-9a-f]+(?:[-0-9a-zA-Z/#.]*|)\b|)
+
+# hit-count: 7 file-count: 4
+# Wikipedia
+\ben\.wikipedia\.org/wiki/[-\w%.#]+
+
+# hit-count: 5 file-count: 3
+# Non-English
+[a-zA-Z]*[ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*
+
+# hit-count: 4 file-count: 4
+# Twitter status
+\btwitter\.com/[^/\s"')]*(?:/status/\d+(?:\?[-_0-9a-zA-Z&=]*|)|)
+
+# hit-count: 3 file-count: 3
+# stackexchange -- https://stackexchange.com/feeds/sites
+\b(?:askubuntu|serverfault|stack(?:exchange|overflow)|superuser).com/(?:questions/\w+/[-\w]+|a/)
+
+# hit-count: 3 file-count: 2
+# vs devops
+\bvisualstudio.com(?::443|)/[-\w/?=%&.]*
+
+# hit-count: 2 file-count: 2
+# mailto urls
+mailto:[-a-zA-Z=;:/?%&0-9+@.]{3,}
+
+# hit-count: 2 file-count: 2
+# githubusercontent
+/[-a-z0-9]+\.githubusercontent\.com/[-a-zA-Z0-9?&=_\/.]*
+
+# hit-count: 2 file-count: 2
+# hex runs
+\b[0-9a-fA-F]{16,}\b
+
+# hit-count: 2 file-count: 2
+# curl arguments
+\b(?:\\n|)curl(?:\s+-[a-zA-Z]{1,2}\b)*(?:\s+-[a-zA-Z]{3,})(?:\s+-[a-zA-Z]+)*
+
+# hit-count: 2 file-count: 1
+# microsoft
+\b(?:https?://|)(?:(?:download\.visualstudio|docs|msdn2?|research)\.microsoft|blogs\.msdn)\.com/[-_a-zA-Z0-9()=./%]*
+
+# hit-count: 1 file-count: 1
+# Amazon
+\bamazon\.com/[-\w]+/(?:dp/[0-9A-Z]+|)
+
+# hit-count: 1 file-count: 1
+# gist github
+\bgist\.github\.com/[^/\s"]+/[0-9a-f]+
+
+# hit-count: 1 file-count: 1
+# Contributor
+\[[^\]]+\]\(https://github\.com/[^/\s"]+\)
+
+# hit-count: 1 file-count: 1
+# medium
+\bmedium\.com/\@?[^/\s"]+/[-\w]+
+
+# hit-count: 1 file-count: 1
+# Twitter markdown
+\[\@[^[/\]:]*?\]\(https://twitter.com/[^/\s"')]*(?:/status/\d+(?:\?[-_0-9a-zA-Z&=]*|)|)\)
+
+# Questionably acceptable forms of `in to`
+# Personally, I prefer `log into`, but people object
+# https://www.tprteaching.com/log-into-log-in-to-login/
+\b[Ll]og in to\b
+
+# acceptable duplicates
+# ls directory listings
+[-bcdlpsw](?:[-r][-w][-sx]){3}\s+\d+\s+(\S+)\s+\g{-1}\s+\d+\s+
+# C types and repeated CSS values
+\s(center|div|inherit|long|LONG|none|normal|solid|thin|transparent|very)(?: \g{-1})+\s
+# go templates
+\s(\w+)\s+\g{-1}\s+\`(?:graphql|json|yaml):
+# javadoc / .net
+(?:[\\@](?:groupname|param)|(?:public|private)(?:\s+static|\s+readonly)*)\s+(\w+)\s+\g{-1}\s
+
+# Commit message -- Signed-off-by and friends
+^\s*(?:(?:Based-on-patch|Co-authored|Helped|Mentored|Reported|Reviewed|Signed-off)-by|Thanks-to): (?:[^<]*<[^>]*>|[^<]*)\s*$
+
+# Autogenerated revert commit message
+^This reverts commit [0-9a-f]{40}\.$
+
 # ignore long runs of a single character:
 \b([A-Za-z])\g{-1}{3,}\b
 
diff --git a/.github/actions/spelling/reject.txt b/.github/actions/spelling/reject.txt
index a5ba6f6390e..b5a6d36809f 100644
--- a/.github/actions/spelling/reject.txt
+++ b/.github/actions/spelling/reject.txt
@@ -1,7 +1,10 @@
 ^attache$
 benefitting
-occurence
+occurences?
+^dependan.*
+^oer$
 Sorce
-^[Ss]pae
-^untill
-^wether
+^[Ss]pae.*
+^untill$
+^untilling$
+^wether.*
diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
index 08c0adecd16..0a1fc3d0e0d 100644
--- a/.github/workflows/spelling.yml
+++ b/.github/workflows/spelling.yml
@@ -1,15 +1,57 @@
 name: Spell Check
+
+# Comment management is handled through a secondary job, for details see:
+# https://github.com/check-spelling/check-spelling/wiki/Feature%3A-Restricted-Permissions
+#
+# `jobs.comment-push` runs when a push is made to a repository and the `jobs.spelling` job needs to make a comment
+#   (in odd cases, it might actually run just to collapse a comment, but that's fairly rare)
+#   it needs `contents: write` in order to add a comment.
+#
+# `jobs.comment-pr` runs when a pull_request is made to a repository and the `jobs.spelling` job needs to make a comment
+#   or collapse a comment (in the case where it had previously made a comment and now no longer needs to show a comment)
+#   it needs `pull-requests: write` in order to manipulate those comments.
+
+# Updating pull request branches is managed via comment handling.
+# For details, see: https://github.com/check-spelling/check-spelling/wiki/Feature:-Update-expect-list
+#
+# These elements work together to make it happen:
+#
+# `on.issue_comment`
+#   This event listens to comments by users asking to update the metadata.
+#
+# `jobs.update`
+#   This job runs in response to an issue_comment and will push a new commit
+#   to update the spelling metadata.
+#
+# `with.experimental_apply_changes_via_bot`
+#   Tells the action to support and generate messages that enable it
+#   to make a commit to update the spelling metadata.
+#
+# `with.ssh_key`
+#   In order to trigger workflows when the commit is made, you can provide a
+#   secret (typically, a write-enabled github deploy key).
+#
+#   For background, see: https://github.com/check-spelling/check-spelling/wiki/Feature:-Update-with-deploy-key
+
 on:
   push:
     branches:
       - master
       - "*-stable"
+    tags-ignore:
+      - "**"
   # Switch from `pull_request_target` event to reduce distraction from comments
   # regarding errors reported in unmodified files.
   pull_request:
     branches:
       - master
       - "*-stable"
+    tags-ignore:
+      - "**"
+    types:
+      - 'opened'
+      - 'reopened'
+      - 'synchronize'
 
 jobs:
   spelling:
@@ -37,3 +79,18 @@ jobs:
         checkout: true
         # If running without `: write`, posting a comment won't work, and for security `: write` permissions are left to a distinct (optional) job, here we skip trying to post a comment:
         post_comment: 0
+        use_magic_file: 1
+        extra_dictionary_limit: 10
+        extra_dictionaries:
+          cspell:software-terms/src/software-terms.txt
+          cspell:php/php.txt
+          cspell:node/node.txt
+          cspell:django/django.txt
+          cspell:html/html.txt
+          cspell:npm/npm.txt
+          cspell:ruby/ruby.txt
+          cspell:fullstack/fullstack.txt
+          cspell:filetypes/filetypes.txt
+        check_extra_dictionaries: ''
+
+# This workflow has opted not to use comments (users can view the report in GitHub Step Summary)
diff --git a/docs/_docs/continuous-integration/razorops.md b/docs/_docs/continuous-integration/razorops.md
index fc92d339596..a7c17cf0fbe 100644
--- a/docs/_docs/continuous-integration/razorops.md
+++ b/docs/_docs/continuous-integration/razorops.md
@@ -22,7 +22,7 @@ With [Razorops][razorops-homepage] you can set up your Jekyll websites project's
 
 ## 1. Getting started
 
-1. Log in at [https://razorops.com/][razorops-homepage] with your GitHub/Bitbucket or Gitlab account
+1. Log in at [https://razorops.com/][razorops-homepage] with your GitHub/Bitbucket or GitLab account
 2. Create a pipeline, choose your Git provider and select your Jekyll Project
 3. Add .razorops.yaml file in your root directory of your project
 4. Add environment var and your deployment is ready
diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index 4c9056a4a87..2caed814143 100644
--- a/docs/_docs/contributing.md
+++ b/docs/_docs/contributing.md
@@ -15,7 +15,7 @@ See the [support guidelines](https://jekyllrb.com/docs/support/)
 Whether you're a developer, a designer, or just a Jekyll devotee, there are lots of ways to contribute. Here's a few ideas:
 
 - [Install Jekyll on your computer](https://jekyllrb.com/docs/installation/) and kick the tires. Does it work? Does it do what you'd expect? If not, [open an issue](https://github.com/jekyll/jekyll/issues/new) and let us know.
-- Comment on some of the project's [open issues](https://github.com/jekyll/jekyll/issues). Have you experienced the same problem? Know a work around? Do you have a suggestion for how the feature could be better?
+- Comment on some of the project's [open issues](https://github.com/jekyll/jekyll/issues). Have you experienced the same problem? Know a workaround? Do you have a suggestion for how the feature could be better?
 - Read through the [documentation](https://jekyllrb.com/docs/home/), and click the "improve this page" button, any time you see something confusing, or have a suggestion for something that could be improved.
 - Browse through the [Jekyll discussion forum](https://talk.jekyllrb.com/), and lend a hand answering questions. There's a good chance you've already experienced what another user is experiencing.
 - Find an [open issue](https://github.com/jekyll/jekyll/issues) (especially [those labeled `help-wanted`](https://github.com/jekyll/jekyll/issues?q=is%3Aopen+is%3Aissue+label%3Ahelp-wanted)), and submit a proposed fix. If it's your first pull request, we promise we won't bite, and are glad to answer any questions.
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 40137d680b5..09119ef13c4 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -186,7 +186,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Remove Aerobatic ([#9007]({{ site.repository }}/issues/9007))
 - Add Jekyll 3.9.2 release post to 'master' branch ([#9013]({{ site.repository }}/issues/9013))
 - Simplify macOS installation docs ([#8993]({{ site.repository }}/issues/8993))
-- Improve document about Github Actions section ([#8853]({{ site.repository }}/issues/8853))
+- Improve document about GitHub Actions section ([#8853]({{ site.repository }}/issues/8853))
 - Update permalinks.md  ([#9017]({{ site.repository }}/issues/9017))
 - Add clarity to docs on permalinks placeholders and built-ins ([#8995]({{ site.repository }}/issues/8995))
 - Remove Ionic Framework site from showcase ([#9057]({{ site.repository }}/issues/9057))
@@ -1370,7 +1370,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - make flakey test more robust ([#6277]({{ site.repository }}/issues/6277))
 - Add a quick test for DataReader ([#6284]({{ site.repository }}/issues/6284))
 - script/backport-pr: commit message no longer includes the `#` ([#6289]({{ site.repository }}/issues/6289))
-- Add Add CODEOWNERS file to help automate reviews. ([#6320]({{ site.repository }}/issues/6320))
+- Add CODEOWNERS file to help automate reviews. ([#6320]({{ site.repository }}/issues/6320))
 - Fix builds on codeclimate ([#6333]({{ site.repository }}/issues/6333))
 - Bump rubies on Travis ([#6366]({{ site.repository }}/issues/6366))
 
@@ -2529,7 +2529,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Fixed an unclear code comment in site template SCSS ([#3837]({{ site.repository }}/issues/3837))
 - Fix reading of binary metadata file ([#3845]({{ site.repository }}/issues/3845))
 - Remove var collision with site template header menu iteration variable ([#3838]({{ site.repository }}/issues/3838))
-- Change non-existent `hl_linenos` to `hl_lines` to allow passthrough in safe mode ([#3787]({{ site.repository }}/issues/3787))
+- Change nonexistent `hl_linenos` to `hl_lines` to allow passthrough in safe mode ([#3787]({{ site.repository }}/issues/3787))
 - Add missing flag to disable the watcher ([#3820]({{ site.repository }}/issues/3820))
 - Update CI guide to include more direct explanations of the flow ([#3891]({{ site.repository }}/issues/3891))
 - Set `future` to `false` in the default config ([#3892]({{ site.repository }}/issues/3892))
@@ -2866,7 +2866,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Document the `name` variable for collection permalinks ([#2829]({{ site.repository }}/issues/2829))
 - Adds info about installing jekyll in current dir ([#2839]({{ site.repository }}/issues/2839))
 - Remove deprecated `jekyll-projectlist` plugin from list of third-party plugins ([#2742]({{ site.repository }}/issues/2742))
-- Remove tag plugins that are built in to Jekyll ([#2751]({{ site.repository }}/issues/2751))
+- Remove tag plugins that are built into Jekyll ([#2751]({{ site.repository }}/issues/2751))
 - Add `markdown-writer` package for Atom Editor to list of third-party plugins ([#2763]({{ site.repository }}/issues/2763))
 - Fix typo in site documentation for collections ([#2764]({{ site.repository }}/issues/2764))
 - Fix minor typo on plugins docs page ([#2765]({{ site.repository }}/issues/2765))
diff --git a/docs/_docs/maintaining/triaging-an-issue.md b/docs/_docs/maintaining/triaging-an-issue.md
index ac0833b1f08..b797ff01975 100644
--- a/docs/_docs/maintaining/triaging-an-issue.md
+++ b/docs/_docs/maintaining/triaging-an-issue.md
@@ -20,7 +20,7 @@ If the issue describes a feature request, ask:
 
 1. Is this a setting? [Settings are a crutch](http://ben.balter.com/2016/03/08/optimizing-for-power-users-and-edge-cases/#settings-are-a-crutch) for doing "the right thing". Settings usually point to a bad default or an edge case that could be solved easily with a plugin. Keep the :christmas_tree: of settings as small as possible so as not to reduce the usability of the product. We like the philosophy "decisions not options."
 2. Would at least 80% of users find it useful? If even a quarter of our users won't use it, it's very likely that the request doesn't fit our product's core goal.
-3. Is there another way to accomplish the end goal of the request? Most feature requests are due to bad documentation for or understanding of a pre-existing feature. See if you can clarify the end goal of the request. What is the user trying to do? Could they accomplish that goal through another feature we already support?
+3. Is there another way to accomplish the end goal of the request? Most feature requests are due to bad documentation for or understanding of a preexisting feature. See if you can clarify the end goal of the request. What is the user trying to do? Could they accomplish that goal through another feature we already support?
 4. Even if 80% of our users will use it, does it fit the core goal of our project? We are writing a tool for making static websites, not a swiss army knife for publishing more generally.
 
 Feel free to get others' opinions and ask questions of the issue author, but depending upon the answers to the questions above, it may be out of scope for our project.
diff --git a/docs/_docs/troubleshooting.md b/docs/_docs/troubleshooting.md
index 105833ffc84..e6cfc35d047 100644
--- a/docs/_docs/troubleshooting.md
+++ b/docs/_docs/troubleshooting.md
@@ -317,7 +317,7 @@ The issue is caused by trying to copy a non-existing symlink.
   
      Please report issues you encounter!
      
   
      
   If you come across a bug, please create an issue
-  on GitHub describing the problem and any work-arounds you find so we can
+  on GitHub describing the problem and any workarounds you find so we can
   document it here for others.
   
      
 
    
diff --git a/docs/pages/resources.md b/docs/pages/resources.md
index 0b2be7522ec..126dc1c4391 100644
--- a/docs/pages/resources.md
+++ b/docs/pages/resources.md
@@ -78,7 +78,7 @@ Use a SaaS service as a backend for functionality on your Jekyll site
 - [markdown-writer](https://atom.io/packages/markdown-writer): An Atom package for Jekyll. It can create new posts/drafts, manage tags/categories, insert link/images and add many useful key mappings.
 - [sublime-jekyll](https://github.com/23maverick23/sublime-jekyll): A Sublime Text package for Jekyll static sites. This package should help creating Jekyll sites and posts easier by providing access to key template tags and filters, as well as common completions and a current date/datetime command (for dating posts). You can install this package manually via GitHub, or via [Package Control](https://packagecontrol.io/packages/Jekyll).
 - [vim-jekyll](https://github.com/parkr/vim-jekyll): A vim plugin to generate new posts and run `jekyll build` all without leaving vim.
-- [WordPress2Jekyll](https://wordpress.org/plugins/wp2jekyll/): A WordPress plugin that allows you to use WordPress as your editor and (automatically) export content in to Jekyll. WordPress2Jekyll attempts to marry these two systems together in order to make a site that can be easily managed from all devices.
+- [WordPress2Jekyll](https://wordpress.org/plugins/wp2jekyll/): A WordPress plugin that allows you to use WordPress as your editor and (automatically) export content into Jekyll. WordPress2Jekyll attempts to marry these two systems together in order to make a site that can be easily managed from all devices.
 
 ## Posts
 
diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb
index 7e0129367be..eec7133cbbe 100644
--- a/lib/jekyll/commands/doctor.rb
+++ b/lib/jekyll/commands/doctor.rb
@@ -88,7 +88,7 @@ def fsnotify_buggy?(_site)
             Jekyll.logger.error <<~STR
               We have detected that there might be trouble using fsevent on your
               operating system, you can read https://github.com/thibaudgg/rb-fsevent/wiki/no-fsevents-fired-(OSX-bug)
-              for possible work arounds or you can work around it immediately
+              for possible workarounds or you can work around it immediately
               with `--force-polling`.
             STR
 

From 80f799b0b6a9545fe175bc2c406a2276692284de Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 1 Feb 2023 05:37:07 -0800
Subject: [PATCH 189/290] Update history to reflect merge of #9199 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index acf14e7e791..17b56b13257 100644
--- a/History.markdown
+++ b/History.markdown
@@ -27,6 +27,7 @@
   * test: use hash explicitly for Struct initializer for ruby 3.2 (#9237)
   * script/default-site: accept flags for `jekyll new` (#9259)
   * Bump check-spelling/check-spelling from 0.0.20 to 0.0.21 (#9205)
+  * Use check-spelling/check-spelling@v0.0.21 (#9199)
 
 ### Bug Fixes
 

From 7b6dc1f287dbbd9f67f2162e7df2dd2cae433492 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 1 Feb 2023 19:20:49 +0530
Subject: [PATCH 190/290] Update History doc to reflect spelling corrections
 [ci skip]

---
 History.markdown | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/History.markdown b/History.markdown
index 17b56b13257..e3c9b6a7563 100644
--- a/History.markdown
+++ b/History.markdown
@@ -204,7 +204,7 @@
   * Remove Aerobatic (#9007)
   * Add Jekyll 3.9.2 release post to 'master' branch (#9013)
   * Simplify macOS installation docs (#8993)
-  * Improve document about Github Actions section (#8853)
+  * Improve document about GitHub Actions section (#8853)
   * Update permalinks.md  (#9017)
   * Add clarity to docs on permalinks placeholders and built-ins (#8995)
   * Remove Ionic Framework site from showcase (#9057)
@@ -1278,7 +1278,7 @@
   * make flakey test more robust (#6277)
   * Add a quick test for DataReader (#6284)
   * script/backport-pr: commit message no longer includes the `#` (#6289)
-  * Add Add CODEOWNERS file to help automate reviews. (#6320)
+  * Add CODEOWNERS file to help automate reviews. (#6320)
   * Fix builds on codeclimate (#6333)
   * Bump rubies on Travis (#6366)
 
@@ -2336,7 +2336,7 @@
   * Fixed an unclear code comment in site template SCSS (#3837)
   * Fix reading of binary metadata file (#3845)
   * Remove var collision with site template header menu iteration variable (#3838)
-  * Change non-existent `hl_linenos` to `hl_lines` to allow passthrough in safe mode (#3787)
+  * Change nonexistent `hl_linenos` to `hl_lines` to allow passthrough in safe mode (#3787)
   * Add missing flag to disable the watcher (#3820)
   * Update CI guide to include more direct explanations of the flow (#3891)
   * Set `future` to `false` in the default config (#3892)
@@ -2645,7 +2645,7 @@
   * Document the `name` variable for collection permalinks (#2829)
   * Adds info about installing jekyll in current dir (#2839)
   * Remove deprecated `jekyll-projectlist` plugin from list of third-party plugins (#2742)
-  * Remove tag plugins that are built in to Jekyll (#2751)
+  * Remove tag plugins that are built into Jekyll (#2751)
   * Add `markdown-writer` package for Atom Editor to list of third-party plugins (#2763)
   * Fix typo in site documentation for collections (#2764)
   * Fix minor typo on plugins docs page (#2765)

From 66e6b2f2d3fdc52b046ed5ee61f54fd725f80a72 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 1 Feb 2023 19:36:22 +0530
Subject: [PATCH 191/290] Strip extra newlines in History document [ci skip]

---
 History.markdown      | 4 +---
 docs/_docs/history.md | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/History.markdown b/History.markdown
index e3c9b6a7563..2c596ca05c4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -41,9 +41,7 @@
 ### Bug Fixes
 
   * 3.9.x: Support i18n 1.x (#9269)
-  * Backport #8880 for v3.9.x: Support both tzinfo v1 and v2 along with
-
-    non-half hour offsets (#9280)
+  * Backport #8880 for v3.9.x: Support both tzinfo v1 and v2 along with non-half hour offsets (#9280)
 
 ### Development Fixes
 
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 09119ef13c4..4b0d5f921fd 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -11,8 +11,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 {: #bug-fixes-v3-9-3}
 
 - 3.9.x: Support i18n 1.x ([#9269]({{ site.repository }}/issues/9269))
-- Backport [#8880]({{ site.repository }}/issues/8880) for v3.9.x: Support both tzinfo v1 and v2 along with
-    non-half hour offsets ([#9280]({{ site.repository }}/issues/9280))
+- Backport [#8880]({{ site.repository }}/issues/8880) for v3.9.x: Support both tzinfo v1 and v2 along with non-half hour offsets ([#9280]({{ site.repository }}/issues/9280))
 
 ### Development Fixes
 {: #development-fixes-v3-9-3}

From 4ecbeb40638b001761a0740ad15aeda8afeede83 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 16 Feb 2023 17:56:21 +0530
Subject: [PATCH 192/290] Bump RuboCop to v1.45.x (#9305)

Merge pull request 9305
---
 .rubocop.yml              |  1 +
 Gemfile                   |  2 +-
 lib/jekyll/static_file.rb | 10 ++++------
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 8e3114500af..b79cbfc8503 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -447,6 +447,7 @@ Style/RescueModifier:
 Style/SafeNavigation:
   Exclude:
     - lib/jekyll/document.rb
+    - lib/jekyll/page.rb
 Style/SignalException:
   EnforcedStyle: only_raise
 Style/SingleArgumentDig:
diff --git a/Gemfile b/Gemfile
index 0593306c247..62ebbea8a13 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 1.38.0"
+  gem "rubocop", "~> 1.45.0"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rake"
diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index f7d99f6d452..13479b0de21 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -4,7 +4,9 @@ module Jekyll
   class StaticFile
     extend Forwardable
 
-    attr_reader :relative_path, :extname, :name
+    attr_reader :relative_path, :extname,
+                :type, # Returns the type of the collection if present, nil otherwise.
+                :name
 
     def_delegator :to_liquid, :to_json, :to_json
 
@@ -34,6 +36,7 @@ def initialize(site, base, dir, name, collection = nil)
       @collection = collection
       @relative_path = File.join(*[@dir, @name].compact)
       @extname = File.extname(@name)
+      @type = @collection&.label&.to_sym
     end
     # rubocop: enable Metrics/ParameterLists
 
@@ -171,11 +174,6 @@ def url
       end
     end
 
-    # Returns the type of the collection if present, nil otherwise.
-    def type
-      @type ||= @collection.nil? ? nil : @collection.label.to_sym
-    end
-
     # Returns the front matter defaults defined for the file's URL and/or type
     # as defined in _config.yml.
     def defaults

From 56bbf589110bd56a6087225cad05dc0655c88222 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 16 Feb 2023 04:26:23 -0800
Subject: [PATCH 193/290] Update history to reflect merge of #9305 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 2c596ca05c4..8afc0f66af7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,7 @@
   * script/default-site: accept flags for `jekyll new` (#9259)
   * Bump check-spelling/check-spelling from 0.0.20 to 0.0.21 (#9205)
   * Use check-spelling/check-spelling@v0.0.21 (#9199)
+  * Bump RuboCop to v1.45.x (#9305)
 
 ### Bug Fixes
 

From 0cbcf93779f8807979c87456c755f2fdace61c6b Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 16 Feb 2023 18:51:24 +0530
Subject: [PATCH 194/290] [Docs]: Define `:path` url-placeholder in sample
 plugin [skip ci]

---
 docs/_docs/plugins/generators.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/_docs/plugins/generators.md b/docs/_docs/plugins/generators.md
index 06716eb48dd..774e33a54dc 100644
--- a/docs/_docs/plugins/generators.md
+++ b/docs/_docs/plugins/generators.md
@@ -87,6 +87,7 @@ module SamplePlugin
     # Placeholders that are used in constructing page URL.
     def url_placeholders
       {
+        :path       => @dir,
         :category   => @dir,
         :basename   => basename,
         :output_ext => output_ext,

From ecf098580d2362540a2627d8f663446458563b16 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 16 Feb 2023 20:10:15 +0530
Subject: [PATCH 195/290] [Docs]: Adjust line-length in Markdown code-blocks 
 [skip appveyor]

---
 docs/_docs/step-by-step/08-blogging.md | 39 +++++++++++++-------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/docs/_docs/step-by-step/08-blogging.md b/docs/_docs/step-by-step/08-blogging.md
index 249d2c35f10..09f35a085e0 100644
--- a/docs/_docs/step-by-step/08-blogging.md
+++ b/docs/_docs/step-by-step/08-blogging.md
@@ -19,14 +19,15 @@ following content:
 layout: post
 author: jill
 ---
-A banana is an edible fruit – botanically a berry – produced by several kinds
-of large herbaceous flowering plants in the genus Musa.
+
+A banana is an edible fruit – botanically a berry – produced by several
+kinds of large herbaceous flowering plants in the genus Musa.
 
 In some countries, bananas used for cooking may be called "plantains",
-distinguishing them from dessert bananas. The fruit is variable in size, color,
-and firmness, but is usually elongated and curved, with soft flesh rich in
-starch covered with a rind, which may be green, yellow, red, purple, or brown
-when ripe.
+distinguishing them from dessert bananas. The fruit is variable in size,
+color, and firmness, but is usually elongated and curved, with soft
+flesh rich in starch covered with a rind, which may be green, yellow,
+red, purple, or brown when ripe.
 ```
 
 This is like the `about.md` you created before except it has an author and
@@ -115,11 +116,11 @@ author: jill
 ---
 An apple is a sweet, edible fruit produced by an apple tree.
 
-Apple trees are cultivated worldwide, and are the most widely grown species in
-the genus Malus. The tree originated in Central Asia, where its wild ancestor,
-Malus sieversii, is still found today. Apples have been grown for thousands of
-years in Asia and Europe, and were brought to North America by European
-colonists.
+Apple trees are cultivated worldwide, and are the most widely grown
+species in the genus Malus. The tree originated in Central Asia, where
+its wild ancestor, Malus sieversii, is still found today. Apples have
+been grown for thousands of years in Asia and Europe, and were brought
+to North America by European colonists.
 ```
 
 `_posts/2018-08-22-kiwifruit.md`:
@@ -129,14 +130,14 @@ colonists.
 layout: post
 author: ted
 ---
-Kiwifruit (often abbreviated as kiwi), or Chinese gooseberry is the edible
-berry of several species of woody vines in the genus Actinidia.
-
-The most common cultivar group of kiwifruit is oval, about the size of a large
-hen's egg (5–8 cm (2.0–3.1 in) in length and 4.5–5.5 cm (1.8–2.2 in) in
-diameter). It has a fibrous, dull greenish-brown skin and bright green or
-golden flesh with rows of tiny, black, edible seeds. The fruit has a soft
-texture, with a sweet and unique flavor.
+Kiwifruit (often abbreviated as kiwi), or Chinese gooseberry is the
+edible berry of several species of woody vines in the genus Actinidia.
+
+The most common cultivar group of kiwifruit is oval, about the size of
+a large hen's egg (5–8 cm (2.0–3.1 in) in length and 4.5–5.5 cm
+(1.8–2.2 in) in diameter). It has a fibrous, dull greenish-brown skin
+and bright green or golden flesh with rows of tiny, black, edible
+seeds. The fruit has a soft texture, with a sweet and unique flavor.
 ```
 
 Open http://localhost:4000

From 16a1e5cac427b493dd7a315c70af72136b34515c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= 
Date: Tue, 21 Feb 2023 14:57:03 -0800
Subject: [PATCH 196/290] Fix `jekyll serve --detach` with
 jekyll-sass-converter 3.x (#9304)

Merge pull request 9304
---
 lib/jekyll/commands/serve.rb |  7 +++++++
 test/test_commands_serve.rb  | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 4600130f45c..e54542ff537 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -274,12 +274,19 @@ def launch_browser(server, opts)
         def boot_or_detach(server, opts)
           if opts["detach"]
             pid = Process.fork do
+              # Detach the process from controlling terminal
+              $stdin.reopen("/dev/null", "r")
+              $stdout.reopen("/dev/null", "w")
+              $stderr.reopen("/dev/null", "w")
               server.start
             end
 
             Process.detach(pid)
             Jekyll.logger.info "Server detached with pid '#{pid}'.",
                                "Run `pkill -f jekyll' or `kill -9 #{pid}' to stop the server."
+
+            # Exit without running `at_exit` inherited by the forked process.
+            Process.exit! 0
           else
             t = Thread.new { server.start }
             trap("INT") { server.shutdown }
diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb
index fe9d972cd4a..b7828b010b2 100644
--- a/test/test_commands_serve.rb
+++ b/test/test_commands_serve.rb
@@ -313,4 +313,36 @@ def serve(opts)
       @merc.execute(:serve, "watch" => false)
     end
   end
+
+  context "using --detach" do
+    setup do
+      skip_if_windows "fork is not supported on Windows"
+      skip("fork is not supported by JRuby") if jruby?
+
+      @temp_dir = Dir.mktmpdir("jekyll_serve_detach_test")
+      @destination = File.join(@temp_dir, "_site")
+      Dir.mkdir(@destination) || flunk("Could not make directory #{@destination}")
+    end
+
+    teardown do
+      FileUtils.remove_entry_secure(@temp_dir, true)
+    end
+
+    should "fork into daemon process" do
+      process, output = Jekyll::Utils::Exec.run("jekyll", "serve",
+                                                "--source", @temp_dir,
+                                                "--dest", @destination,
+                                                "--detach")
+
+      re = %r!Server detached with pid '(?\d+)'!
+
+      assert_match re, output
+      assert_equal 0, process.exitstatus
+
+      pid = re.match(output)["pid"].to_i
+      assert pid > 1
+
+      Process.kill 9, pid
+    end
+  end
 end

From ee2d29937019bcda77af51194db5b09153765e3e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 21 Feb 2023 14:57:05 -0800
Subject: [PATCH 197/290] Update history to reflect merge of #9304 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 8afc0f66af7..a627bd404ee 100644
--- a/History.markdown
+++ b/History.markdown
@@ -36,6 +36,7 @@
   * Remove totals in profile table properly (#9186)
   * Optimize `Site#each_site_file` (#9187)
   * Rename sass partial created for new blank site (#9257)
+  * Fix `jekyll serve --detach` with jekyll-sass-converter 3.x (#9304)
 
 ## 3.9.3 / 2023-01-29
 

From 73fcc423536d4d45f4ea2e22c6917b65135ff0c2 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 2 Mar 2023 12:48:53 +0530
Subject: [PATCH 198/290] Normalize line-endings in test plugins

---
 test/source/_plugins/custom_block.rb | 28 ++++++++++++++--------------
 test/source/_plugins/dummy.rb        | 18 +++++++++---------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/test/source/_plugins/custom_block.rb b/test/source/_plugins/custom_block.rb
index eee0fbaadaa..286b02c04f3 100644
--- a/test/source/_plugins/custom_block.rb
+++ b/test/source/_plugins/custom_block.rb
@@ -1,14 +1,14 @@
-# frozen_string_literal: true
-
-# For testing excerpt handling of custom tags
-
-module Jekyll
-  class DoNothingBlock < Liquid::Block
-  end
-
-  class DoNothingOther < Liquid::Tag
-  end
-end
-
-Liquid::Template.register_tag("do_nothing", Jekyll::DoNothingBlock)
-Liquid::Template.register_tag("do_nothing_other", Jekyll::DoNothingOther)
+# frozen_string_literal: true
+
+# For testing excerpt handling of custom tags
+
+module Jekyll
+  class DoNothingBlock < Liquid::Block
+  end
+
+  class DoNothingOther < Liquid::Tag
+  end
+end
+
+Liquid::Template.register_tag("do_nothing", Jekyll::DoNothingBlock)
+Liquid::Template.register_tag("do_nothing_other", Jekyll::DoNothingOther)
diff --git a/test/source/_plugins/dummy.rb b/test/source/_plugins/dummy.rb
index 25eef88e21b..5c233df697f 100644
--- a/test/source/_plugins/dummy.rb
+++ b/test/source/_plugins/dummy.rb
@@ -1,9 +1,9 @@
-# frozen_string_literal: true
-
-module Jekyll
-  class Dummy < Generator
-    priority :high
-
-    def generate(site) end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  class Dummy < Generator
+    priority :high
+
+    def generate(site) end
+  end
+end

From 052f1bd412ef0b032eed1d73e2869bed92db6795 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 2 Mar 2023 12:54:09 +0530
Subject: [PATCH 199/290] Revert "Normalize line-endings in test plugins"

This reverts commit 73fcc423536d4d45f4ea2e22c6917b65135ff0c2.
---
 test/source/_plugins/custom_block.rb | 28 ++++++++++++++--------------
 test/source/_plugins/dummy.rb        | 18 +++++++++---------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/test/source/_plugins/custom_block.rb b/test/source/_plugins/custom_block.rb
index 286b02c04f3..eee0fbaadaa 100644
--- a/test/source/_plugins/custom_block.rb
+++ b/test/source/_plugins/custom_block.rb
@@ -1,14 +1,14 @@
-# frozen_string_literal: true
-
-# For testing excerpt handling of custom tags
-
-module Jekyll
-  class DoNothingBlock < Liquid::Block
-  end
-
-  class DoNothingOther < Liquid::Tag
-  end
-end
-
-Liquid::Template.register_tag("do_nothing", Jekyll::DoNothingBlock)
-Liquid::Template.register_tag("do_nothing_other", Jekyll::DoNothingOther)
+# frozen_string_literal: true
+
+# For testing excerpt handling of custom tags
+
+module Jekyll
+  class DoNothingBlock < Liquid::Block
+  end
+
+  class DoNothingOther < Liquid::Tag
+  end
+end
+
+Liquid::Template.register_tag("do_nothing", Jekyll::DoNothingBlock)
+Liquid::Template.register_tag("do_nothing_other", Jekyll::DoNothingOther)
diff --git a/test/source/_plugins/dummy.rb b/test/source/_plugins/dummy.rb
index 5c233df697f..25eef88e21b 100644
--- a/test/source/_plugins/dummy.rb
+++ b/test/source/_plugins/dummy.rb
@@ -1,9 +1,9 @@
-# frozen_string_literal: true
-
-module Jekyll
-  class Dummy < Generator
-    priority :high
-
-    def generate(site) end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  class Dummy < Generator
+    priority :high
+
+    def generate(site) end
+  end
+end

From d03742e994f6a73eeac1121815fc49706aefcbad Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 24 Mar 2023 14:29:18 +0530
Subject: [PATCH 200/290] Handle TypeError from `where` filter gracefully
 (#9292)

Merge pull request 9292
---
 lib/jekyll/filters.rb |  8 ++++++++
 test/test_filters.rb  | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 5422d52a492..7a79eec9eb6 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -441,6 +441,14 @@ def read_liquid_attribute(liquid_data, property)
       property.split(".").reduce(liquid_data) do |data, key|
         data.respond_to?(:[]) && data[key]
       end
+    rescue TypeError => e
+      msg = if liquid_data.is_a?(Array)
+              "Error accessing object (#{liquid_data.to_s[0...20]}) with given key. Expected an " \
+                "integer but got #{property.inspect} instead."
+            else
+              e.message
+            end
+      raise e, msg
     end
 
     FLOAT_LIKE   = %r!\A\s*-?(?:\d+\.?\d*|\.\d+)\s*\Z!.freeze
diff --git a/test/test_filters.rb b/test/test_filters.rb
index ee9b31af036..8992e76f5be 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -958,6 +958,18 @@ def to_liquid
         results = @filter.where(SelectDummy.new, "obj", "1 == 1")
         assert_equal [], results
       end
+
+      should "gracefully handle invalid property type" do
+        hash = {
+          "members" => { "name" => %w(John Jane Jimmy) },
+          "roles"   => %w(Admin Recruiter Manager),
+        }
+        err = assert_raises(TypeError) { @filter.where(hash, "name", "Jimmy") }
+        truncatd_arr_str = hash["roles"].to_liquid.to_s[0...20]
+        msg = "Error accessing object (#{truncatd_arr_str}) with given key. Expected an integer " \
+              'but got "name" instead.'
+        assert_equal msg, err.message
+      end
     end
 
     context "where_exp filter" do

From 8c8c88eec0c61206e3bfab4ead5bbfbc8df19b43 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 24 Mar 2023 01:59:21 -0700
Subject: [PATCH 201/290] Update history to reflect merge of #9292 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index a627bd404ee..8550ba2e1d1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -37,6 +37,7 @@
   * Optimize `Site#each_site_file` (#9187)
   * Rename sass partial created for new blank site (#9257)
   * Fix `jekyll serve --detach` with jekyll-sass-converter 3.x (#9304)
+  * Handle TypeError from `where` filter gracefully (#9292)
 
 ## 3.9.3 / 2023-01-29
 

From 6bedc7e069991727a6f119ae5f76543b29d4305c Mon Sep 17 00:00:00 2001
From: waqarnazir <86599489+waqarnazir@users.noreply.github.com>
Date: Sun, 26 Mar 2023 14:05:10 +0500
Subject: [PATCH 202/290] Bump Rubocop to version 1.48.x (#9326)

Merge pull request 9326
---
 .rubocop.yml       | 4 +++-
 Gemfile            | 2 +-
 lib/jekyll/site.rb | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index b79cbfc8503..a5c67dc973c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -368,7 +368,7 @@ Style/GuardClause:
 Style/HashAsLastArrayItem:
   Enabled: true
 Style/HashConversion:
-  Enabled: true  
+  Enabled: true
 Style/HashEachMethods:
   Enabled: true
 Style/HashExcept:
@@ -392,6 +392,8 @@ Style/MapCompactWithConditionalBlock:
   Enabled: true
 Style/MapToHash:
   Enabled: true
+Style/MinMaxComparison:
+  Enabled: true
 Style/MixinUsage:
   Exclude:
     - test/helper.rb
diff --git a/Gemfile b/Gemfile
index 62ebbea8a13..2b9a5a5f89d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 1.45.0"
+  gem "rubocop", "~> 1.48.0"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rake"
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 9ef08c32438..06031bfdf6e 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -486,7 +486,7 @@ def load_theme_configuration(config)
     # Returns nothing
     def limit_posts!
       if limit_posts.positive?
-        limit = posts.docs.length < limit_posts ? posts.docs.length : limit_posts
+        limit = [posts.docs.length, limit_posts].min
         posts.docs = posts.docs[-limit, limit]
       end
     end

From 7785ef670f61e0d141207cbc1322f59c3cb20fce Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 26 Mar 2023 02:05:13 -0700
Subject: [PATCH 203/290] Update history to reflect merge of #9326 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 8550ba2e1d1..ef95c0a3113 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * Bump check-spelling/check-spelling from 0.0.20 to 0.0.21 (#9205)
   * Use check-spelling/check-spelling@v0.0.21 (#9199)
   * Bump RuboCop to v1.45.x (#9305)
+  * Bump Rubocop to version 1.48.x (#9326)
 
 ### Bug Fixes
 

From bb954ff16e380d233821f57fde44fcbb8ae599ca Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 9 Apr 2023 19:48:28 +0530
Subject: [PATCH 204/290] Prefer using `assert_instance_of`

To appease RuboCop `Minitest/AssertInstanceOf`
---
 test/test_page.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test_page.rb b/test/test_page.rb
index 593d006ee80..e5d34447c28 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -384,8 +384,8 @@ def do_render(page)
 
           should "initialize excerpt eagerly but render only when needed" do
             test_page = Jekyll::Page.new(@configured_site, source_dir, "contacts", "foo.md")
-            assert_equal Jekyll::PageExcerpt, test_page.data["excerpt"].class
-            assert_equal String, test_page.excerpt.class
+            assert_instance_of Jekyll::PageExcerpt, test_page.data["excerpt"]
+            assert_instance_of String, test_page.excerpt
             assert_equal(
               "
    Contact Information
    \n",
               test_page.excerpt

From c6dfae56d0ca72b9675802b597f77d34847e8e9b Mon Sep 17 00:00:00 2001
From: Joe Mahoney 
Date: Tue, 9 May 2023 01:25:44 +1200
Subject: [PATCH 205/290] Bump versions of ruby & nodejs in devcontainer
 (#9360)

Merge pull request 9360
---
 .devcontainer/Dockerfile        | 4 ++--
 .devcontainer/devcontainer.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index d79e1e705a9..93249a80ef7 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-FROM ruby:2
+FROM ruby:3.0
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -28,7 +28,7 @@ RUN apt-get update \
     #
     # Install node.js
     && apt-get -y install curl software-properties-common \
-    && curl -sL https://deb.nodesource.com/setup_13.x | bash - \
+    && curl -sL https://deb.nodesource.com/setup_18.x | bash - \
     && apt-get -y install nodejs \
     #
     # Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 6b449c63477..8aff32edb05 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,7 +1,7 @@
 // For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.101.1/containers/ruby-2
 {
-	"name": "Ruby 2",
+	"name": "Ruby 3",
 	"dockerFile": "Dockerfile",
 
 	// Set *default* container specific settings.json values on container create.

From 58a1f62b2349bb477fc9999c40331cecdca577d8 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 8 May 2023 06:25:46 -0700
Subject: [PATCH 206/290] Update history to reflect merge of #9360 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index ef95c0a3113..eae1c312802 100644
--- a/History.markdown
+++ b/History.markdown
@@ -30,6 +30,7 @@
   * Use check-spelling/check-spelling@v0.0.21 (#9199)
   * Bump RuboCop to v1.45.x (#9305)
   * Bump Rubocop to version 1.48.x (#9326)
+  * Bump versions of ruby & nodejs in devcontainer (#9360)
 
 ### Bug Fixes
 

From 11987c65e052ee4b41f7a8714b311270dd078711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20H=C3=BCbelbauer?= 
Date: Mon, 5 Jun 2023 14:45:31 +0200
Subject: [PATCH 207/290] Document Exclude behavior, Include overrides and the
 default exclusion list (#9376)

Merge pull request 9376
---
 docs/_data/config_options/global.yml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/docs/_data/config_options/global.yml b/docs/_data/config_options/global.yml
index 406e841ea67..d645aa70244 100644
--- a/docs/_data/config_options/global.yml
+++ b/docs/_data/config_options/global.yml
@@ -40,13 +40,33 @@
   description: >-
     Exclude directories and/or files from the conversion. These exclusions are relative to the site's source directory
     and cannot be outside the source directory.
+    
    
+    In Jekyll 3, the `exclude` configuration option replaces the default exclusion list.
+    
    
+    In Jekyll 4, user-provided entries get added to the default exclusion list instead and the `include` option can be
+    used to override the default exclusion list entries.
+    
    
+    The default exclusions are found in _config.yml as created by jekyll new:
+    
      
+      
    • .sass-cache/
      • 
+      
    • .jekyll-cache/
      • 
+      
    • gemfiles/
      • 
+      
    • Gemfile
      • 
+      
    • Gemfile.lock
      • 
+      
    • node_modules/
      • 
+      
    • vendor/bundle/
      • 
+      
    • vendor/cache/
      • 
+      
    • vendor/gems/
      • 
+      
    • vendor/ruby/
      • 
+    
    
   option: "exclude: [DIR, FILE, ...]"
 
 
 - name: Include
   description: >-
     Force inclusion of directories and/or files in the conversion. .htaccess is a good example since
-    dotfiles are excluded by default.
+    dotfiles are excluded by default. With Jekyll 4, the `include` configuration option entries override the
+    `exclude` option entries.
   option: "include: [DIR, FILE, ...]"
 
 

From 07c8d98e88e2f49158c794a665c8fdbb2ae199c0 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 5 Jun 2023 05:45:33 -0700
Subject: [PATCH 208/290] Update history to reflect merge of #9376 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index eae1c312802..0edb794403b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
   * Mark `highlight` `mark_lines` feature as 4.4 in docs (#9184)
   * Add v3.9.3 release history & post to `master` branch (#9284)
   * Update S3 deployment to remove s3_website (#9221)
+  * Document Exclude behavior, Include overrides and the default exclusion list (#9376)
 
 ### Development Fixes
 

From acae1e1ce82af0e5fa237be95ebe1861abe41fd8 Mon Sep 17 00:00:00 2001
From: Joe Mahoney 
Date: Tue, 6 Jun 2023 00:48:56 +1200
Subject: [PATCH 209/290] Bump rubocop version to 1.52.x (#9361)

Merge pull request 9361
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 2b9a5a5f89d..93ece7e253a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 1.48.0"
+  gem "rubocop", "~> 1.52.0"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rake"

From 0be06e5eb1f2abfa6fb4ede7ff9f3948fbc3cf85 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 5 Jun 2023 05:48:58 -0700
Subject: [PATCH 210/290] Update history to reflect merge of #9361 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 0edb794403b..336514b8379 100644
--- a/History.markdown
+++ b/History.markdown
@@ -32,6 +32,7 @@
   * Bump RuboCop to v1.45.x (#9305)
   * Bump Rubocop to version 1.48.x (#9326)
   * Bump versions of ruby & nodejs in devcontainer (#9360)
+  * Bump rubocop version to 1.52.x (#9361)
 
 ### Bug Fixes
 

From fdb4c623ba7a33361fd8db2fa4dba7f080659456 Mon Sep 17 00:00:00 2001
From: Joe Mahoney 
Date: Sun, 9 Jul 2023 10:24:36 +1200
Subject: [PATCH 211/290] #9398 upgrade RuboCop to 1.54 (#9401)

Merge pull request 9401
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 93ece7e253a..3f98c83c496 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 1.52.0"
+  gem "rubocop", "~> 1.54.0"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rake"

From e2527eb8728108d2e6517e7550d12756ad2c904f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 8 Jul 2023 15:24:38 -0700
Subject: [PATCH 212/290] Update history to reflect merge of #9401 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 336514b8379..194c2ea905d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -33,6 +33,7 @@
   * Bump Rubocop to version 1.48.x (#9326)
   * Bump versions of ruby & nodejs in devcontainer (#9360)
   * Bump rubocop version to 1.52.x (#9361)
+  * Upgrade RuboCop to 1.54 (#9401)
 
 ### Bug Fixes
 

From d04f1afc81f7541f9d23cf9fe92730134349dea8 Mon Sep 17 00:00:00 2001
From: William Entriken 
Date: Mon, 10 Jul 2023 11:14:06 -0400
Subject: [PATCH 213/290] Update macos.md (#9405)

Merge pull request 9405
---
 docs/_docs/installation/macos.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md
index 6bec19d4db8..7ef1515f464 100644
--- a/docs/_docs/installation/macos.md
+++ b/docs/_docs/installation/macos.md
@@ -7,7 +7,6 @@ permalink: /docs/installation/macos/
 
 - Monterey (macOS 12)
 - Big Sur (macOS 11)
-- Catalina (macOS 10.15)
 
 Older macOS versions might work, but we don't officially support them.
 

From aef05280c80cd3995a3efb81ef9c377673ab19e1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 10 Jul 2023 08:14:08 -0700
Subject: [PATCH 214/290] Update history to reflect merge of #9405 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 194c2ea905d..7497786f96a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,7 @@
   * Add v3.9.3 release history & post to `master` branch (#9284)
   * Update S3 deployment to remove s3_website (#9221)
   * Document Exclude behavior, Include overrides and the default exclusion list (#9376)
+  * Update macos.md, remove Catalina (macOS 10.15) (#9405)
 
 ### Development Fixes
 

From dd4312270cd78dc22586abccc78373490f2466e9 Mon Sep 17 00:00:00 2001
From: William Entriken 
Date: Mon, 10 Jul 2023 15:00:11 -0400
Subject: [PATCH 215/290] Update macos.md (#9406)

Merge pull request 9406
---
 docs/_docs/installation/macos.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md
index 7ef1515f464..95c1cb9fd0c 100644
--- a/docs/_docs/installation/macos.md
+++ b/docs/_docs/installation/macos.md
@@ -5,6 +5,7 @@ permalink: /docs/installation/macos/
 
 ## Supported macOS versions
 
+- Ventura (macOS 13)
 - Monterey (macOS 12)
 - Big Sur (macOS 11)
 

From a6b861cd9509002b8da7b4d3168d79a84a86c6ba Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 10 Jul 2023 12:00:13 -0700
Subject: [PATCH 216/290] Update history to reflect merge of #9406 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 7497786f96a..b70a2a06b5c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -18,6 +18,7 @@
   * Update S3 deployment to remove s3_website (#9221)
   * Document Exclude behavior, Include overrides and the default exclusion list (#9376)
   * Update macos.md, remove Catalina (macOS 10.15) (#9405)
+  * Update macos.md, add support for Ventura (#9406)
 
 ### Development Fixes
 

From d99471332d878797d0123aad33b926e4befa9a97 Mon Sep 17 00:00:00 2001
From: Muhab Abdelreheem 
Date: Fri, 11 Aug 2023 19:47:03 -0700
Subject: [PATCH 217/290] Typo fix - update to hooks and 3rd party deployment
 and one other article (#9411)

Merge pull request 9411
---
 docs/_docs/deployment/third-party.md | 2 +-
 docs/_docs/plugins/hooks.md          | 1 +
 docs/pages/resources.md              | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/deployment/third-party.md b/docs/_docs/deployment/third-party.md
index 41ca6ee1cc0..30ab98ccf51 100644
--- a/docs/_docs/deployment/third-party.md
+++ b/docs/_docs/deployment/third-party.md
@@ -39,7 +39,7 @@ Use [Kickster](https://kickster.nielsenramon.com/) for automated deploys to GitH
 
 Kickster provides a basic Jekyll project setup packed with web best practices and useful optimization tools increasing your overall project quality. Kickster ships with automated and worry-free deployment scripts for GitHub Pages.
 
-Install the Kickster gem and you are good to go. More documentation can here found [here](https://github.com/nielsenramon/kickster#kickster). If you do not want to use the gem or start a new project you can just copy paste the deployment scripts for [Travis CI](https://github.com/nielsenramon/kickster/tree/master/snippets/travis) or [Circle CI](https://github.com/nielsenramon/kickster#automated-deployment-with-circle-ci).
+Install the Kickster gem and you are good to go. More documentation can be found [here](https://github.com/nielsenramon/kickster#kickster). If you do not want to use the gem or start a new project you can just copy paste the deployment scripts for [Travis CI](https://github.com/nielsenramon/kickster/tree/master/snippets/travis) or [Circle CI](https://github.com/nielsenramon/kickster#automated-deployment-with-circle-ci).
 
 ## Netlify
 
diff --git a/docs/_docs/plugins/hooks.md b/docs/_docs/plugins/hooks.md
index e3447cbd07a..d8a9947ff5a 100644
--- a/docs/_docs/plugins/hooks.md
+++ b/docs/_docs/plugins/hooks.md
@@ -212,6 +212,7 @@ The complete list of available hooks:
       
       
         
    After converting the post content, but before rendering the postlayout
    
+        
    After converting the post content, but before rendering the post layout
    
       
     
     
diff --git a/docs/pages/resources.md b/docs/pages/resources.md
index 126dc1c4391..d9a4177433e 100644
--- a/docs/pages/resources.md
+++ b/docs/pages/resources.md
@@ -88,7 +88,7 @@ Use a SaaS service as a backend for functionality on your Jekyll site
 - [Adding Ajax pagination to Jekyll](https://eduardoboucas.com/blog/2014/11/05/adding-ajax-pagination-to-jekyll.html)
 - ['About this Website', by Carter Allen](http://cartera.me/2010/08/12/about-this-website/)
 
-  > "Jekyll is everything that I ever wanted in a blogging engine. Really. It isn't perfect, but what's excellent about it is that if there's something wrong, I know exactly how it works and how to fix it. It runs on the your machine only, and is essentially an added"build" step between you and the browser. I coded this entire site in TextMate using standard HTML5 and CSS3, and then at the end I added just a few little variables to the markup. Presto-chango, my site is built and I am at peace with the world."
+  > "Jekyll is everything that I ever wanted in a blogging engine. Really. It isn't perfect, but what's excellent about it is that if there's something wrong, I know exactly how it works and how to fix it. It runs on the your machine only, and is essentially an added "build" step between you and the browser. I coded this entire site in TextMate using standard HTML5 and CSS3, and then at the end I added just a few little variables to the markup. Presto-chango, my site is built and I am at peace with the world."
 
 - A way to [extend Jekyll](https://github.com/rfelix/jekyll_ext) without forking and modifying the Jekyll gem codebase and some [portable Jekyll extensions](https://github.com/rfelix/jekyll_ext/wiki/Extensions) that can be reused and shared.
 - [Using your Rails layouts in Jekyll](https://numbers.brighterplanet.com/2010/08/09/sharing-rails-views-with-jekyll)

From cb6676ba13b288d6b71b491ebf9137fae1e39090 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 11 Aug 2023 19:47:04 -0700
Subject: [PATCH 218/290] Update history to reflect merge of #9411 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index b70a2a06b5c..176d7fe7359 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
   * Document Exclude behavior, Include overrides and the default exclusion list (#9376)
   * Update macos.md, remove Catalina (macOS 10.15) (#9405)
   * Update macos.md, add support for Ventura (#9406)
+  * Typo fix - update to hooks and 3rd party deployment and one other article (#9411)
 
 ### Development Fixes
 

From e57c755c6fa71bcb922cdd1784356179cea32b7e Mon Sep 17 00:00:00 2001
From: Sutou Kouhei 
Date: Sat, 12 Aug 2023 11:49:14 +0900
Subject: [PATCH 219/290] Add support for upcoming logger 1.4.3 (#9392)

Merge pull request 9392
---
 lib/jekyll/stevenson.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/stevenson.rb b/lib/jekyll/stevenson.rb
index 4cfc7fbba87..10e5a0b2189 100644
--- a/lib/jekyll/stevenson.rb
+++ b/lib/jekyll/stevenson.rb
@@ -3,13 +3,10 @@
 module Jekyll
   class Stevenson < ::Logger
     def initialize
-      @progname = nil
-      @level = DEBUG
-      @default_formatter = Formatter.new
-      @logdev = $stdout
-      @formatter = proc do |_, _, _, msg|
+      formatter = proc do |_, _, _, msg|
         msg.to_s
       end
+      super($stdout, :formatter => formatter)
     end
 
     def add(severity, message = nil, progname = nil)

From 6ee39423cd9f6a130dd53f82a7bcb39f68b8bb35 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 11 Aug 2023 19:49:16 -0700
Subject: [PATCH 220/290] Update history to reflect merge of #9392 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 176d7fe7359..49245024146 100644
--- a/History.markdown
+++ b/History.markdown
@@ -46,6 +46,7 @@
   * Rename sass partial created for new blank site (#9257)
   * Fix `jekyll serve --detach` with jekyll-sass-converter 3.x (#9304)
   * Handle TypeError from `where` filter gracefully (#9292)
+  * Add support for upcoming logger 1.4.3 (#9392)
 
 ## 3.9.3 / 2023-01-29
 

From 76a9a194cfd59edf47418533ef1a4c284e548ceb Mon Sep 17 00:00:00 2001
From: Shruti Dalvi <123170794+ShrutiRDalvi@users.noreply.github.com>
Date: Mon, 14 Aug 2023 01:47:58 +0530
Subject: [PATCH 221/290] Update 07-assets.md (#9393)

Merge pull request 9393
---
 docs/_docs/step-by-step/07-assets.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/step-by-step/07-assets.md b/docs/_docs/step-by-step/07-assets.md
index 4ea8748b556..93b6750dd2b 100644
--- a/docs/_docs/step-by-step/07-assets.md
+++ b/docs/_docs/step-by-step/07-assets.md
@@ -17,14 +17,14 @@ Jekyll sites often use this structure to keep assets organized:
 ...
 ```
 So, from your assets folder, create folders called css, images and js.
-Additionally, directly under the root create another folder called '_sass', which you will need shortly.
+Additionally, directly under the root create another folder called `_sass`, which you will need shortly.
 
 ## Sass
 
 Inlining the styles used in `_includes/navigation.html`(adding or configuring within the same file) is not a best practice.
 Instead, let's style the current page by defining our first class in a new css file instead. 
 
-To do this, refer to the class (that you will configure in the next parts of this step) from within the navigation.html file by removing the code you added earlier (to color the current link red) and inserting the following code:
+To do this, refer to the class (that you will configure in the next parts of this step) from within the `navigation.html` file by removing the code you added earlier (to color the current link red) and inserting the following code:
 
 {% raw %}
 ```liquid

From 21847cf7989b373f1e6cd0dc11b3d2bb11aa3800 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 13 Aug 2023 13:18:00 -0700
Subject: [PATCH 222/290] Update history to reflect merge of #9393 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 49245024146..1c055d88098 100644
--- a/History.markdown
+++ b/History.markdown
@@ -20,6 +20,7 @@
   * Update macos.md, remove Catalina (macOS 10.15) (#9405)
   * Update macos.md, add support for Ventura (#9406)
   * Typo fix - update to hooks and 3rd party deployment and one other article (#9411)
+  * Update 07-assets.md (#9393)
 
 ### Development Fixes
 

From 0ab743204ac8c67ac0893d50a29a4c0589aeab69 Mon Sep 17 00:00:00 2001
From: IFcoltransG <47414286+IFcoltransG@users.noreply.github.com>
Date: Mon, 14 Aug 2023 12:31:49 +1200
Subject: [PATCH 223/290] Note the front matter requirement in pages.md (#9423)

Merge pull request 9423
---
 docs/_docs/pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/pages.md b/docs/_docs/pages.md
index 369ab13a8d1..7b217288b84 100644
--- a/docs/_docs/pages.md
+++ b/docs/_docs/pages.md
@@ -9,7 +9,7 @@ members or recipes).
 
 The simplest way of adding a page is to add an HTML file in the root
 directory with a suitable filename. You can also write a page in Markdown using
-a `.md` extension which converts to HTML on build. For a site with
+a `.md` extension and front matter which converts to HTML on build. For a site with
 a homepage, an about page, and a contact page, here’s what the root directory
 and associated URLs might look like:
 

From 16fb63a32675b9ba25232846b46d7f9e4b26472e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 13 Aug 2023 17:31:51 -0700
Subject: [PATCH 224/290] Update history to reflect merge of #9423 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 1c055d88098..e3a36a1851b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -21,6 +21,7 @@
   * Update macos.md, add support for Ventura (#9406)
   * Typo fix - update to hooks and 3rd party deployment and one other article (#9411)
   * Update 07-assets.md (#9393)
+  * Mention the front matter requirement in pages.md (#9423)
 
 ### Development Fixes
 

From 8c4bed5e4f5c73089a3a944d470d05e0eadea127 Mon Sep 17 00:00:00 2001
From: Ram Vasuthevan <36580682+RamVasuthevan@users.noreply.github.com>
Date: Sun, 13 Aug 2023 20:32:28 -0400
Subject: [PATCH 225/290] Fix typo in devcontainer.json (#9364)

Merge pull request 9364
---
 .devcontainer/devcontainer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 8aff32edb05..e5a1a0aa582 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -12,15 +12,15 @@
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
 		"rebornix.Ruby"
-	]
+	],
 	
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "bundle install",
+	"postCreateCommand": "bundle install"
 
 	// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
 	// "remoteUser": "vscode"
 
-}
\ No newline at end of file
+}

From e5c4948de6344a4170988a34242163a04a074f9f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 13 Aug 2023 17:32:30 -0700
Subject: [PATCH 226/290] Update history to reflect merge of #9364 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index e3a36a1851b..d3685a45468 100644
--- a/History.markdown
+++ b/History.markdown
@@ -49,6 +49,7 @@
   * Fix `jekyll serve --detach` with jekyll-sass-converter 3.x (#9304)
   * Handle TypeError from `where` filter gracefully (#9292)
   * Add support for upcoming logger 1.4.3 (#9392)
+  * Fix typo in devcontainer.json (#9364)
 
 ## 3.9.3 / 2023-01-29
 

From dafa28d40c517057bbbf169d1d2463bb91dc1aff Mon Sep 17 00:00:00 2001
From: Joe Mahoney 
Date: Mon, 14 Aug 2023 12:32:43 +1200
Subject: [PATCH 227/290] Point to the Rouge GitHub repo rather than broken
 website (#9362)

Merge pull request 9362
---
 docs/_docs/liquid/tags.md      | 2 +-
 docs/_docs/upgrading/2-to-3.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/liquid/tags.md b/docs/_docs/liquid/tags.md
index 227aba496df..3d48745920f 100644
--- a/docs/_docs/liquid/tags.md
+++ b/docs/_docs/liquid/tags.md
@@ -15,7 +15,7 @@ If you have page snippets that you use repeatedly across your site, an
 ## Code snippet highlighting
 
 Jekyll has built in support for syntax highlighting of over 100 languages
-thanks to [Rouge](http://rouge.jneen.net). Rouge is the default highlighter
+thanks to [Rouge](https://github.com/rouge-ruby/rouge). Rouge is the default highlighter
 in Jekyll 3 and above.
 
 {: .note .warning}
diff --git a/docs/_docs/upgrading/2-to-3.md b/docs/_docs/upgrading/2-to-3.md
index f034d492c39..5c5d5ded8ce 100644
--- a/docs/_docs/upgrading/2-to-3.md
+++ b/docs/_docs/upgrading/2-to-3.md
@@ -89,7 +89,7 @@ then the layout can access that via {% raw %}`{{ layout.class }}`{% endraw %}.
 
 For the first time, the default syntax highlighter has changed for the
 `highlight` tag and for backtick code blocks. Instead of [Pygments.rb](https://github.com/tmm1/pygments.rb),
-it's now [Rouge](http://rouge.jneen.net/). If you were using the `highlight` tag with certain
+it's now [Rouge](https://github.com/rouge-ruby/rouge). If you were using the `highlight` tag with certain
 options, such as `hl_lines`, they may not be available when using Rouge. To
 go back to using Pygments, set `highlighter: pygments` in your
 `_config.yml` file and run `gem install pygments.rb` or add

From e90053e489225450f18d625496dbf8db011836c7 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 13 Aug 2023 17:32:44 -0700
Subject: [PATCH 228/290] Update history to reflect merge of #9362 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index d3685a45468..c688856cc03 100644
--- a/History.markdown
+++ b/History.markdown
@@ -22,6 +22,7 @@
   * Typo fix - update to hooks and 3rd party deployment and one other article (#9411)
   * Update 07-assets.md (#9393)
   * Mention the front matter requirement in pages.md (#9423)
+  * Point to the Rouge GitHub repo rather than broken website (#9362)
 
 ### Development Fixes
 

From 71fe6aaa0aa9e4813888d9fa1f8776564eb2f571 Mon Sep 17 00:00:00 2001
From: Robert Austin 
Date: Mon, 14 Aug 2023 10:33:00 +1000
Subject: [PATCH 229/290] Add new theme directory to themes resources (#9356)

Merge pull request 9356
---
 docs/pages/resources.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/pages/resources.md b/docs/pages/resources.md
index d9a4177433e..1a19f58bcca 100644
--- a/docs/pages/resources.md
+++ b/docs/pages/resources.md
@@ -14,6 +14,7 @@ some of the most popular Jekyll resources.
 - [jamstackthemes.dev](https://jamstackthemes.dev/ssg/jekyll/)
 - [jekyllthemes.org](http://jekyllthemes.org/)
 - [jekyllthemes.io](https://jekyllthemes.io/)
+- [builtatlightspeed.com](https://builtatlightspeed.com/category/jekyll)
 
 See also: [docs/themes](/docs/themes/).
 

From 3198f2e922567e5160c05e70a38fbdcbe5a29088 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 13 Aug 2023 17:33:02 -0700
Subject: [PATCH 230/290] Update history to reflect merge of #9356 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index c688856cc03..f4e07a6dab5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -23,6 +23,7 @@
   * Update 07-assets.md (#9393)
   * Mention the front matter requirement in pages.md (#9423)
   * Point to the Rouge GitHub repo rather than broken website (#9362)
+  * Add new theme directory to themes resources (#9356)
 
 ### Development Fixes
 

From 2277999f39d1111bdd488700923107bd4ab697e7 Mon Sep 17 00:00:00 2001
From: Maciek Palmowski 
Date: Mon, 14 Aug 2023 02:33:08 +0200
Subject: [PATCH 231/290] Adds Kinsta to 3rd party deployments (#9331)

Merge pull request 9331
---
 docs/_docs/deployment/third-party.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/_docs/deployment/third-party.md b/docs/_docs/deployment/third-party.md
index 30ab98ccf51..af88f207fe8 100644
--- a/docs/_docs/deployment/third-party.md
+++ b/docs/_docs/deployment/third-party.md
@@ -72,3 +72,9 @@ Read this [Jekyll step-by-step guide](https://www.21yunbox.com/docs/#/deploy-jek
 ## Layer0
 
 [Layer0](https://www.layer0.co) is an all-in-one platform to develop, deploy, preview, experiment on, monitor, and run your headless frontend. It is focused on large, dynamic websites and best-in-class performance through EdgeJS (a JavaScript-based Content Delivery Network), predictive prefetching, and performance monitoring. Layer0 offers a free tier. Get started in just a few minutes by following [Layer0's guide to deploying Jekyll](https://docs.layer0.co/guides/jekyll).
+
+## Kinsta Application Hosting
+[Kinsta Application Hosting](https://kinsta.com/application-hosting) is a Cloud Platform designed to help your company and dev teams ship web projects faster and more efficiently. You can host your apps, databases, and sites all in one place. Easily connect with GitHub and automate deployments and get 24/7 support for all your favorite languages and frameworks.
+
+Read [this guide](https://kinsta.com/docs/jekyll-static-site-example/) to learn how to deploy Jekyll site on Kinsta.
+

From f8a3f9bb6ae659ef4e51f4d2fde79192c4842309 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 13 Aug 2023 17:33:11 -0700
Subject: [PATCH 232/290] Update history to reflect merge of #9331 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index f4e07a6dab5..5384c0144d7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -24,6 +24,7 @@
   * Mention the front matter requirement in pages.md (#9423)
   * Point to the Rouge GitHub repo rather than broken website (#9362)
   * Add new theme directory to themes resources (#9356)
+  * Adds Kinsta to 3rd party deployments (#9331)
 
 ### Development Fixes
 

From 4c882541d72e739d7a4e498130477fa08e81ae58 Mon Sep 17 00:00:00 2001
From: James Hoctor 
Date: Sun, 13 Aug 2023 20:33:16 -0400
Subject: [PATCH 233/290] Update Fedora prerequisites to include g++ (#9290)

Merge pull request 9290
---
 docs/_docs/installation/other-linux.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/installation/other-linux.md b/docs/_docs/installation/other-linux.md
index b6420afc8a3..6d120f19963 100644
--- a/docs/_docs/installation/other-linux.md
+++ b/docs/_docs/installation/other-linux.md
@@ -10,7 +10,7 @@ Installation on other Linux distributions works similarly to installing on [Ubun
 ### Fedora
 
 ```sh
-sudo dnf install ruby ruby-devel openssl-devel redhat-rpm-config @development-tools
+sudo dnf install ruby ruby-devel openssl-devel redhat-rpm-config gcc-c++ @development-tools
 ```
 ### RHEL8/CentOS8
 

From 1e18bef7c06be287700bd50192d436628ae36e81 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 13 Aug 2023 17:33:18 -0700
Subject: [PATCH 234/290] Update history to reflect merge of #9290 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 5384c0144d7..b92feaa498f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Point to the Rouge GitHub repo rather than broken website (#9362)
   * Add new theme directory to themes resources (#9356)
   * Adds Kinsta to 3rd party deployments (#9331)
+  * Update Fedora prerequisites to include g++ (#9290)
 
 ### Development Fixes
 

From a385117f2c1a9b651c0348977fdc4e3fbc9230e6 Mon Sep 17 00:00:00 2001
From: Jorge <46056498+jorgectf@users.noreply.github.com>
Date: Mon, 14 Aug 2023 02:52:22 +0200
Subject: [PATCH 235/290] Add CodeQL workflow (#9397)

Merge pull request 9397
---
 .github/workflows/codeql.yml | 65 ++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 .github/workflows/codeql.yml

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 00000000000..0502bb144ea
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,65 @@
+name: "CodeQL"
+
+on:
+#  push:
+#    branches: [ 'master' ]
+#  pull_request:
+#    # The branches below must be a subset of the branches above
+#    branches: [ 'master' ]
+  schedule:
+    - cron: '56 11 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby', 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

From 0b1aaf5dc14194ae2534181fe9da59d3dac4f6cc Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 13 Aug 2023 17:52:24 -0700
Subject: [PATCH 236/290] Update history to reflect merge of #9397 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index b92feaa498f..bcce67bda4a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -43,6 +43,7 @@
   * Bump versions of ruby & nodejs in devcontainer (#9360)
   * Bump rubocop version to 1.52.x (#9361)
   * Upgrade RuboCop to 1.54 (#9401)
+  * Add CodeQL workflow (#9397)
 
 ### Bug Fixes
 

From 1fbd42ceebe2f36adf7e35b30f8269f59899d5f3 Mon Sep 17 00:00:00 2001
From: Jonas Jared Jacek <78449400+j15k@users.noreply.github.com>
Date: Mon, 14 Aug 2023 20:21:22 +0200
Subject: [PATCH 237/290] Update convert-site-to-jekyll.md (#9348)

Merge pull request 9348
---
 docs/_tutorials/convert-site-to-jekyll.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_tutorials/convert-site-to-jekyll.md b/docs/_tutorials/convert-site-to-jekyll.md
index e31c0a1f94f..8577074426c 100644
--- a/docs/_tutorials/convert-site-to-jekyll.md
+++ b/docs/_tutorials/convert-site-to-jekyll.md
@@ -426,7 +426,7 @@ layout: null
 ---
 
 
-
+
 
     
         {{ site.title }}

From d86ba153fe012fbf4c62dc4af9dd73df1f1cfd58 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 14 Aug 2023 11:21:25 -0700
Subject: [PATCH 238/290] Update history to reflect merge of #9348 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index bcce67bda4a..acfae247208 100644
--- a/History.markdown
+++ b/History.markdown
@@ -26,6 +26,7 @@
   * Add new theme directory to themes resources (#9356)
   * Adds Kinsta to 3rd party deployments (#9331)
   * Update Fedora prerequisites to include g++ (#9290)
+  * Update convert-site-to-jekyll.md (#9348)
 
 ### Development Fixes
 

From 0417baf05847802b4d5b949861b12dd89d4b601d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= 
Date: Thu, 14 Sep 2023 02:05:44 -0700
Subject: [PATCH 239/290] Update github-actions documentation (#9426)

Merge pull request 9426
---
 .github/actions/spelling/expect.txt           |   2 +
 .../continuous-integration/github-actions.md  | 147 +++---------------
 2 files changed, 20 insertions(+), 129 deletions(-)

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index 5d2aca0580f..5b3da289572 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -62,6 +62,7 @@ bridgetownrb
 brightbox
 brighterplanet
 buddyworks
+builtatlightspeed
 Bugfix
 Burela
 byparker
@@ -317,6 +318,7 @@ Kewin
 keycdn
 kickster
 Kinnula
+kinsta
 kiwifruit
 Kolesky
 konklone
diff --git a/docs/_docs/continuous-integration/github-actions.md b/docs/_docs/continuous-integration/github-actions.md
index 392bde82d05..932f7ebbb72 100644
--- a/docs/_docs/continuous-integration/github-actions.md
+++ b/docs/_docs/continuous-integration/github-actions.md
@@ -10,8 +10,9 @@ with GitHub Pages you can use GitHub Actions.
 
 ### Control over gemset
 
-- **Jekyll version** --- Instead of using the currently enabled version at `3.9.0`, you can use any
-  version of Jekyll you want. For example `{{site.version}}`, or point directly to the repository.
+- **Jekyll version** --- Instead of using the classic GitHub Pages provided version at `3.9.3`, you
+  can use any version of Jekyll you want. For example `{{site.version}}`, or point directly to the
+  repository.
 - **Plugins** --- You can use any Jekyll plugins irrespective of them being on the
   [supported versions][ghp-whitelist] list, even `*.rb` files placed in the `_plugins` directory
   of your site.
@@ -30,17 +31,6 @@ The first and foremost requirement is a Jekyll project hosted at GitHub. Choose
 project or follow the [quickstart]({{ '/docs/' | relative_url }}) and push the repository to GitHub
 if it is not hosted there already.
 
-We're only going to cover builds from the `main` branch in this page. Therefore, ensure that you
-are working on the `main` branch. If necessary, you may create it based on your default branch.
-When the Action builds your site, the contents of the _destination_ directory will be automatically
-pushed to the `gh-pages` branch with a commit, ready to be used for serving.
-
-{: .note .warning}
-The Action we're using here will create (or reset an existing) `gh-pages` branch on every successful
-deploy.
     So, if you have an existing `gh-pages` branch that is used to deploy your production
-build, ensure to make a backup of the contents into a different branch so that you can rollback
-easily if necessary.
-
 The Jekyll site we'll be using for the rest of this page initially consists of just a `_config.yml`,
 an `index.md` page and a `Gemfile`. The contents are respectively:
 
@@ -91,96 +81,17 @@ was generated with an old version of Bundler.
 
 ### Setting up the Action
 
-GitHub Actions are registered for a repository by using a YAML file inside the directory path
-`.github/workflows` (note the dot at the start). For simplicity, here we use one of the
-[Jekyll Actions](#external-links) to show you how to use the action.
-
-Create a **workflow file**, say `github-pages.yml`, using either the GitHub interface or by pushing
-a YAML file to the workflow directory path manually. The base contents are:
-
-{% raw %}
-
-```yaml
-name: Build and deploy Jekyll site to GitHub Pages
-
-on:
-  push:
-    branches:
-      - main # or master before October 2020
-
-jobs:
-  github-pages:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
-      - uses: helaili/jekyll-action@2.0.5    # Choose any one of the Jekyll Actions
-        with:                                # Some relative inputs of your action
-          token: ${{ secrets.GITHUB_TOKEN }}
-```
-
-{% endraw %}
-
-The above workflow can be explained as the following:
-
-- We trigger the build using **on.push** condition for `main` branch only --- this prevents
-  the Action from overwriting the `gh-pages` branch on any feature branch pushes.
-- The **name** of the job matches our YAML filename: `github-pages`.
-- The **checkout** action takes care of cloning your repository.
-- The **cache** action is an optimization to avoid fetching and installing gems on every build.
-- We specify our selected **action** and **version number** using `helaili/jekyll-action@2.0.5`,
-  this handles the build and deploy. You can choose any one of the Jekyll Actions that matches
-  your project and flavor from [GitHub Marketplace](https://github.com/marketplace?type=actions&query=jekyll+action).
-- We set a reference to a secret **environment variable** for the action to use. The `GITHUB_TOKEN`
-  is a secret token automatically initialized at the start of every workflow run.
-  More information can be found in [GitHub documentation](https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret). 
-
-Instead of using the **on.push** condition, you could trigger your build on a **schedule** by
-using the [on.schedule] parameter. For example, here we build daily at midnight by specifying
-**cron** syntax, which can be tested at the [crontab guru] site.
-
-```yaml
-on:
-  schedule:
-    - cron: "0 0 * * *"
-```
-
-Note that this string must be quoted to prevent the asterisks from being evaluated incorrectly.
-
-[on.schedule]: https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#onschedule
-[crontab guru]: https://crontab.guru/
-
-### Providing permissions
-
-At the start of each workflow run, GitHub automatically creates a unique `GITHUB_TOKEN` secret to use in
-your workflow. You can use the `GITHUB_TOKEN` to authenticate in a workflow run. You can use the
-`GITHUB_TOKEN` by using the standard syntax for referencing secrets: `${{ secrets.GITHUB_TOKEN }}`.
-For more information, please read [GitHub's docs on token authentication][github-token-ref]
-
-[github-token-ref]: https://docs.github.com/en/actions/security-guides/automatic-token-authentication
-
-If you need a token that requires permissions that aren't available in the `GITHUB_TOKEN`, you can create
-a Personal Access Token (PAT), and set it as a secret in your repository for this action to push to the
-`gh-pages` branch:
-
-1. On your GitHub profile, under **Developer Settings**, go to the [Personal Access Tokens][tokens]
-   section.
-2. **Create** a token. Give it a name like "GitHub Actions" and ensure it has permissions to
-   `public_repos` (or the entire `repo` scope for private repository) --- necessary for the action
-   to commit to the `gh-pages` branch.
-3. **Copy** the token value.
-4. Go to your repository's **Settings** and then the **Secrets** tab.
-5. **Create** a token named `YOUR_CUSTOM_TOKEN` (_important_). Give it a value using the value copied
-   above.
+1. Go to the **Settings** tab on your repository.
+    1. Click **Pages** under **Code and automation**.
+    2. Change **Source** under **Build and deployment** from **Deploy from a branch** to **GitHub Actions**.
+2. Go to the **Actions** tab on your repository.
+    1. Start a **New workflow** and search for **Jekyll**.
+    2. Click **Configure** under the **Jekyll** workflow (not **GitHub Pages Jekyll** workflow).
+    3. Review the change and click **Commit changes**.
 
 ### Build and deploy
 
-On pushing any local changes onto `main`, the action will be triggered and the build will
+On pushing any local changes onto the default branch, the action will be triggered and the build will
 **start**.
 
 To watch the progress and see any build errors, check on the build **status** using one of the
@@ -193,40 +104,18 @@ following approaches:
 - **Actions tab**
   - Go to the repository's Actions tab. Click on the `jekyll` workflow tab.
 
-If all goes well, all steps will be green and the built assets will now exist on the `gh-pages`
-branch.
-
-On a successful build, GitHub Pages will **publish** the site stored on the repository `gh-pages`
-branches. Note that you do not need to setup a `gh-pages` branch or enable GitHub Pages, as the
-action will take care of this for you.
-(For private repositories, you'll have to upgrade to a paid plan).
-
-To see the **live site**:
-
-1. Go to the **environment** tab on your repository.
-2. Click **View Deployment** to see the deployed site URL.
-3. View your site at the **URL**. Make sure the `timeago` filter works as expected.
-4. Optionally **add** this URL to your repository's main page and to your `README.md`, to make it
-   easy for people to find.
+If all goes well, all steps will be green and the built assets will be uploaded to GitHub Pages. 
 
-When you need to make further **changes** to the site, commit to `master` and push. The workflow
-will build and deploy your site again.
+To see the **live site**, go to the **Deployments** tab on your repository, and click on the deployed
+site URL.
 
-Be sure **not to edit** the `gh-pages` branch directly, as any changes will be lost on the next
-successful deploy from the Action.
+When you need to make further **changes** to the site, commit to the default branch and push.
+The workflow will build and deploy your site again.
 
 ## External links
 
-- [jekyll-actions] is an action available on the GitHub Marketplace and was used in this guide.
-- [jekyll-actions-quickstart] is an unofficial repository that includes a live demo of the
-  `jekyll-actions` action. That project can be used as a template for making a new site.
-- [jekyll-action-ts] is another action to build and publish Jekyll sites on GiHub Pages that includes HTML formatting options with Prettier and caching.
-- [jekyll-deploy-action] is a GitHub Action to deploy the Jekyll site conveniently for GitHub Pages (An alternative action with better speed and compatibility).
+- [starter-workflows] is the official repository providing the workflow template used in this guide.
 
 [ghp-whitelist]: https://pages.github.com/versions/
 [timeago-plugin]: https://rubygems.org/gems/jekyll-timeago
-[tokens]: https://github.com/settings/tokens
-[jekyll-actions]: https://github.com/marketplace/actions/jekyll-actions
-[jekyll-actions-quickstart]: https://github.com/MichaelCurrin/jekyll-actions-quickstart
-[jekyll-action-ts]: https://github.com/limjh16/jekyll-action-ts
-[jekyll-deploy-action]: https://github.com/jeffreytse/jekyll-deploy-action
+[starter-workflows]: https://github.com/actions/starter-workflows/blob/main/pages/jekyll.yml

From 96a640a8c9ff64e3277f49ca2fa2be2aa9a716ca Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 14 Sep 2023 02:05:47 -0700
Subject: [PATCH 240/290] Update history to reflect merge of #9426 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index acfae247208..b64bf3d071a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -27,6 +27,7 @@
   * Adds Kinsta to 3rd party deployments (#9331)
   * Update Fedora prerequisites to include g++ (#9290)
   * Update convert-site-to-jekyll.md (#9348)
+  * Update github-actions documentation (#9426)
 
 ### Development Fixes
 

From 895a5033c03b56735d1740cfed83de7136473e7e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Sep 2023 17:48:51 -0700
Subject: [PATCH 241/290] Bump actions/checkout from 3 to 4 (#9442)

Merge pull request 9442
---
 .github/workflows/benchmark.yml   | 2 +-
 .github/workflows/ci.yml          | 4 ++--
 .github/workflows/codeql.yml      | 2 +-
 .github/workflows/docs.yml        | 2 +-
 .github/workflows/release.yml     | 2 +-
 .github/workflows/third-party.yml | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 0758e3948d3..29052a248b4 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -20,7 +20,7 @@ jobs:
       BENCHMARK: true
     steps:
     - name: Checkout Jekyll
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 34458c90914..2f316a507f9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
             ruby_version: "jruby-9.4.0.0"
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: "Set up ${{ matrix.label }}"
         uses: ruby/setup-ruby@v1
         with:
@@ -60,7 +60,7 @@ jobs:
             ruby_version: "2.7"
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: "Set up Ruby ${{ matrix.ruby_version }}"
         uses: ruby/setup-ruby@v1
         with:
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 0502bb144ea..8687ac80057 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -29,7 +29,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index a24fffd0c31..d02f98fdf12 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -17,7 +17,7 @@ jobs:
       BUNDLE_JOBS: 4
       BUNDLE_RETRY: 3
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ env.RUBY_VERSION }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3585815ac47..9780687e608 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
           - 2.7
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: "Set up Ruby ${{ matrix.ruby_version }}"
         uses: ruby/setup-ruby@v1
         with:
diff --git a/.github/workflows/third-party.yml b/.github/workflows/third-party.yml
index 288f24dfd45..f50864c9fdb 100644
--- a/.github/workflows/third-party.yml
+++ b/.github/workflows/third-party.yml
@@ -18,12 +18,12 @@ jobs:
       BUNDLE_RETRY: 3
     steps:
     - name: Checkout Jekyll
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 5
         path: jekyll
     - name: Checkout Third-Party Repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: ashmaroli/tomjoht.github.io
         path: sandbox

From 65d7a09174fb7a9a61e971104d04096faf4def13 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 14 Sep 2023 17:48:53 -0700
Subject: [PATCH 242/290] Update history to reflect merge of #9442 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index b64bf3d071a..266d9a584b4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -46,6 +46,7 @@
   * Bump rubocop version to 1.52.x (#9361)
   * Upgrade RuboCop to 1.54 (#9401)
   * Add CodeQL workflow (#9397)
+  * Bump actions/checkout from 3 to 4 (#9442)
 
 ### Bug Fixes
 

From d865905d66ccca19449d1dd435f43a12d273c76b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= 
Date: Fri, 15 Sep 2023 17:47:57 +0200
Subject: [PATCH 243/290] Test suite uses shoulda-context only. (#9441)

Merge pull request 9441
---
 Gemfile        | 2 +-
 test/helper.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3f98c83c496..30cd24057f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,7 +48,7 @@ group :test_legacy do
   gem "minitest"
   gem "minitest-profile"
   gem "minitest-reporters"
-  gem "shoulda"
+  gem "shoulda-context"
   gem "simplecov"
 end
 
diff --git a/test/helper.rb b/test/helper.rb
index 3ec9d75cbdf..37258e46b60 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -35,7 +35,7 @@ def jruby?
 Jekyll.logger = Logger.new(StringIO.new, :error)
 
 require "kramdown"
-require "shoulda"
+require "shoulda-context"
 
 include Jekyll
 

From 1d7236f2c2e62cec0cf48d82ccb2985c31cb8594 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Sep 2023 08:47:59 -0700
Subject: [PATCH 244/290] Update history to reflect merge of #9441 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 266d9a584b4..954fac2e96e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -47,6 +47,7 @@
   * Upgrade RuboCop to 1.54 (#9401)
   * Add CodeQL workflow (#9397)
   * Bump actions/checkout from 3 to 4 (#9442)
+  * Test suite uses shoulda-context only. (#9441)
 
 ### Bug Fixes
 

From 3ba746c979e50f5bcd70457fd982ba3398a11cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romero?= 
Date: Sat, 23 Sep 2023 22:47:27 -0400
Subject: [PATCH 245/290] Update resources.md (#9449)

Merge pull request 9449
---
 docs/pages/resources.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/pages/resources.md b/docs/pages/resources.md
index 1a19f58bcca..eef3556d3b7 100644
--- a/docs/pages/resources.md
+++ b/docs/pages/resources.md
@@ -42,8 +42,8 @@ Use a SaaS service as a backend for functionality on your Jekyll site
 ### Content Management
   - [CloudCannon](https://cloudcannon.com/): The Cloud CMS for Jekyll
   - [Contentful](https://github.com/contentful/jekyll-contentful-data-import): Content infrastructure for digital teams
-  - [Forestry.io](https://forestry.io/): A free Git-based responsive CMS, with content modeling and instant previews.
-  - [Netlify CMS](https://www.netlifycms.org/): Open source content management for your Git workflow
+  - [TinaCMS.io](https://tina.io/): Tina is an open-source, Git-backed headless content management system (CMS) that empowers both developers and content creators to collaborate seamlessly on a single platform
+  - [Decap CMS](https://decapcms.org/): Decap CMS (formerly Netlify CMS) is an open source content management system for your Git workflow that enables you to provide editors with a friendly UI and intuitive workflows
   - [Siteleaf](https://www.siteleaf.com/): Built for developers, Loved by everyone
   - [Kentico Kontent](https://github.com/Kentico/kontent-jekyll): A headless CMS with full control over content presentation
 

From 8e4ccfc4ff3020633b378ca81e17b8e7adee1a39 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 23 Sep 2023 19:47:29 -0700
Subject: [PATCH 246/290] Update history to reflect merge of #9449 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 954fac2e96e..8383a5b8a5c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,7 @@
   * Update Fedora prerequisites to include g++ (#9290)
   * Update convert-site-to-jekyll.md (#9348)
   * Update github-actions documentation (#9426)
+  * Update resources.md (#9449)
 
 ### Development Fixes
 

From a70f5cba65c623241a4092988be3bf97df9d8112 Mon Sep 17 00:00:00 2001
From: Matt Rogers 
Date: Sun, 22 Oct 2023 11:47:29 -0500
Subject: [PATCH 247/290] Keep activesupport at version 7.0.x (#9469)

Merge pull request 9469
---
 .github/actions/spelling/allow.txt | 2 ++
 Gemfile                            | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
index 3d1a3f2ac89..8d81b703d12 100644
--- a/.github/actions/spelling/allow.txt
+++ b/.github/actions/spelling/allow.txt
@@ -13,3 +13,5 @@ workaround
 workaround
 workarounds
 WSL
+decapcms
+tina
diff --git a/Gemfile b/Gemfile
index 30cd24057f3..b20285098e3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,6 +15,7 @@ end
 #
 
 group :test do
+  gem "activesupport", "~> 7.0.0"
   gem "cucumber", RUBY_VERSION >= "2.5" ? "~> 5.1.2" : "~> 4.1"
   gem "httpclient"
   gem "jekyll_test_plugin"

From 99f1a235ea0feaa973e44976ceefdd5a2a1c2048 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 22 Oct 2023 09:47:32 -0700
Subject: [PATCH 248/290] Update history to reflect merge of #9469 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 8383a5b8a5c..c171d0c93d8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -49,6 +49,7 @@
   * Add CodeQL workflow (#9397)
   * Bump actions/checkout from 3 to 4 (#9442)
   * Test suite uses shoulda-context only. (#9441)
+  * Keep activesupport at version 7.0.x (#9469)
 
 ### Bug Fixes
 

From d9df973d2cd9d672113d69899aa352fd5ad46a8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20V=C3=A1squez?= 
Date: Sun, 22 Oct 2023 10:49:12 -0600
Subject: [PATCH 249/290] Bump Rubocop to 1.56.4 (#9459)

Merge pull request 9459
---
 Gemfile                  | 2 +-
 lib/jekyll/drops/drop.rb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index b20285098e3..d3a703f48fa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 1.54.0"
+  gem "rubocop", "~> 1.56.4"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rake"
diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb
index 87eed39b554..b82c7b4873e 100644
--- a/lib/jekyll/drops/drop.rb
+++ b/lib/jekyll/drops/drop.rb
@@ -280,7 +280,8 @@ def fetch(key, default = nil, &block)
         return self[key] if key?(key)
         raise KeyError, %(key not found: "#{key}") if default.nil? && block.nil?
         return yield(key) unless block.nil?
-        return default unless default.nil?
+
+        default unless default.nil?
       end
 
       private

From e0c4640a7ad3292c363c3574ac9cad844337f95b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 22 Oct 2023 09:49:14 -0700
Subject: [PATCH 250/290] Update history to reflect merge of #9459 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index c171d0c93d8..3d4c95f6e9d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -50,6 +50,7 @@
   * Bump actions/checkout from 3 to 4 (#9442)
   * Test suite uses shoulda-context only. (#9441)
   * Keep activesupport at version 7.0.x (#9469)
+  * Bump Rubocop to 1.56.4 (#9459)
 
 ### Bug Fixes
 

From c52bbde5ec0292b60c48ae8a41a433cd4df3d352 Mon Sep 17 00:00:00 2001
From: William Entriken 
Date: Sun, 22 Oct 2023 13:49:06 -0400
Subject: [PATCH 251/290] Add GitHub Pages helpful notes (#9235)

Merge pull request 9235
---
 docs/_docs/step-by-step/10-deployment.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/_docs/step-by-step/10-deployment.md b/docs/_docs/step-by-step/10-deployment.md
index 276598197bb..7fd0d08fe37 100644
--- a/docs/_docs/step-by-step/10-deployment.md
+++ b/docs/_docs/step-by-step/10-deployment.md
@@ -42,6 +42,11 @@ bundle exec jekyll serve
 
 This restricts your Ruby environment to only use gems set in your `Gemfile`.
 
+Note: if publishing your site with GitHub Pages, you can match production
+version of Jekyll by using the `github-pages` gem instead of `jekyll`
+in your `Gemfile`. In this scenario you may also want to exclude `Gemfile.lock`
+from your repository because GitHub Pages ignores that file.
+
 ## Plugins
 
 Jekyll plugins allow you to create custom generated content specific to your

From e57890a2904676647475d5038c53c42b313722e5 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 22 Oct 2023 10:49:08 -0700
Subject: [PATCH 252/290] Update history to reflect merge of #9235 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 3d4c95f6e9d..d7ddb796805 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * Update convert-site-to-jekyll.md (#9348)
   * Update github-actions documentation (#9426)
   * Update resources.md (#9449)
+  * Add GitHub Pages helpful notes (#9235)
 
 ### Development Fixes
 

From d0afea2b0388bb2a059953f335c552b107d926e3 Mon Sep 17 00:00:00 2001
From: "Gabriel B. Nunes" 
Date: Tue, 31 Oct 2023 08:48:45 -0700
Subject: [PATCH 253/290] Clarify which version of Jekyll needs
 'jekyll-paginate' (#9477)

Merge pull request 9477
---
 docs/_docs/pagination.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/pagination.md b/docs/_docs/pagination.md
index a9ec1a7e3ed..b82c6db6bf7 100644
--- a/docs/_docs/pagination.md
+++ b/docs/_docs/pagination.md
@@ -8,8 +8,9 @@ break the main listing of posts up into smaller lists and display them over
 multiple pages. Jekyll offers a pagination plugin, so you can automatically
 generate the appropriate files and folders you need for paginated listings.
 
-For Jekyll 3, include the `jekyll-paginate` plugin in your Gemfile and in
-your `_config.yml` under `plugins`. For Jekyll 2, this is standard.
+For Jekyll 3 or higher, include the `jekyll-paginate` plugin in your
+Gemfile and in your `_config.yml` under `plugins`. For Jekyll 2, this is
+standard.
 
 
    
   
    Pagination only works within HTML files
    

From 77bea6951b3980911ef113caab296aef76f5b251 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 31 Oct 2023 08:48:49 -0700
Subject: [PATCH 254/290] Update history to reflect merge of #9477 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index d7ddb796805..ec3a72b7713 100644
--- a/History.markdown
+++ b/History.markdown
@@ -30,6 +30,7 @@
   * Update github-actions documentation (#9426)
   * Update resources.md (#9449)
   * Add GitHub Pages helpful notes (#9235)
+  * Clarify which version of Jekyll needs 'jekyll-paginate' (#9477)
 
 ### Development Fixes
 

From cd4d84a44f9d528fb4588b945a450b1e88e491df Mon Sep 17 00:00:00 2001
From: Matt Rogers 
Date: Tue, 31 Oct 2023 10:59:12 -0500
Subject: [PATCH 255/290] Configure dependabot to handle rubygems dependencies
 (#9445)

Merge pull request 9445
---
 .github/dependabot.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5ace4600a1f..aaee7280c27 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,3 +4,9 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+  - package-ecosystem: bundler
+    reviewers:
+      - "jekyll/core"
+    directory: /
+    schedule:
+      interval: weekly

From 2be8e6ce4fdcda72ee4652f7bfe2a07c71e0f49c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 31 Oct 2023 08:59:14 -0700
Subject: [PATCH 256/290] Update history to reflect merge of #9445 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index ec3a72b7713..a00b4f1f9c9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -53,6 +53,7 @@
   * Test suite uses shoulda-context only. (#9441)
   * Keep activesupport at version 7.0.x (#9469)
   * Bump Rubocop to 1.56.4 (#9459)
+  * Configure dependabot to handle rubygems dependencies (#9445)
 
 ### Bug Fixes
 

From 4bfb4edc4036ae15096c05f9f449b5f46f7f5984 Mon Sep 17 00:00:00 2001
From: David Silveira 
Date: Tue, 31 Oct 2023 13:47:18 -0300
Subject: [PATCH 257/290] Update rubocop gem (#9476)

Merge pull request 9476
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index d3a703f48fa..0669d31cd73 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 1.56.4"
+  gem "rubocop", "~> 1.57.2"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rake"

From 644a704ad5b9c625da4ce743814622d4ec82cabf Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 31 Oct 2023 09:47:20 -0700
Subject: [PATCH 258/290] Update history to reflect merge of #9476 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index a00b4f1f9c9..166be95dcb1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -54,6 +54,7 @@
   * Keep activesupport at version 7.0.x (#9469)
   * Bump Rubocop to 1.56.4 (#9459)
   * Configure dependabot to handle rubygems dependencies (#9445)
+  * Update rubocop gem (#9476)
 
 ### Bug Fixes
 

From 537032c49d765d9cbb83306559d740197639e58d Mon Sep 17 00:00:00 2001
From: Seth Falco 
Date: Tue, 31 Oct 2023 16:48:04 +0000
Subject: [PATCH 259/290] chore: update showcases (#9473)

Merge pull request 9473
---
 docs/_data/showcase.yml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/docs/_data/showcase.yml b/docs/_data/showcase.yml
index a1096663354..6074f588759 100644
--- a/docs/_data/showcase.yml
+++ b/docs/_data/showcase.yml
@@ -12,7 +12,7 @@
 #     - government
 
 - name: SiteLeaf
-  url: https://siteleaf.com
+  url: https://www.siteleaf.com/
   image: siteleaf.png
   categories:
     - software
@@ -52,7 +52,7 @@
     - marketing-site
 
 - name: Bitcoin
-  url: https://bitcoin.org/en/
+  url: https://bitcoin.org/
   image: bitcoin.png
   categories:
     - software
@@ -127,7 +127,7 @@
     - government
 
 - name: U.S. Web Design Standards
-  url: https://standards.usa.gov/
+  url: https://designsystem.digital.gov/
   image: uswds.png
   categories:
     - government
@@ -165,7 +165,7 @@
     - portfolio
 
 - name: Lattice
-  url: https://latticehq.com/
+  url: https://lattice.com/
   image: lattice.png
   categories:
     - software
@@ -196,7 +196,7 @@
     - documentation
 
 - name: Chain
-  url: https://chain.com/
+  url: https://www.chain.com/
   image: chain.png
   categories:
     - marketing-site
@@ -238,13 +238,6 @@
   categories:
     - government
 
-- name: GitHub On Demand Training
-  url: https://services.github.com/on-demand/
-  image: github-learning-lab.png
-  categories:
-    - software
-    - knowledgebase
-
 - name: TwitchCon
   url: https://www.twitchcon.com/
   image: twitchcon.png
@@ -253,13 +246,13 @@
     - conference
 
 - name: UN World Statistics
-  url: https://worldstatisticsday.org
+  url: https://worldstatisticsday.org/
   image: world-statistics-day.png
   categories:
     - government
 
 - name: Netflix Devices
-  url: https://devices.netflix.com/en/
+  url: https://devices.netflix.com/
   image: netflix.png
   categories:
     - marketing-site
@@ -301,7 +294,7 @@
     - software
 
 - name: Sketch
-  url: https://sketch.com/
+  url: https://www.sketch.com/
   image: sketch.png
   categories:
     - software

From 7a79d0ba0c17618328cb1ba82c84c002b41a2599 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 31 Oct 2023 09:48:06 -0700
Subject: [PATCH 260/290] Update history to reflect merge of #9473 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 166be95dcb1..f9700706b4c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -31,6 +31,7 @@
   * Update resources.md (#9449)
   * Add GitHub Pages helpful notes (#9235)
   * Clarify which version of Jekyll needs 'jekyll-paginate' (#9477)
+  * chore: update showcases (#9473)
 
 ### Development Fixes
 

From b427a17315b869bdedfb5830259f559cfdd2f169 Mon Sep 17 00:00:00 2001
From: Gaelan Lloyd 
Date: Fri, 3 Nov 2023 15:21:58 -0700
Subject: [PATCH 261/290] Add FreeBSD installation instructions (#9481)

Merge pull request 9481
---
 docs/_docs/installation.md         |  1 +
 docs/_docs/installation/freebsd.md | 50 ++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 docs/_docs/installation/freebsd.md

diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index 500985704d3..fca51c59461 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -18,5 +18,6 @@ For detailed install instructions, follow the guide for your operating system.
 
 * [macOS]({{ '/docs/installation/macos/' | relative_url }})
 * [Ubuntu]({{ '/docs/installation/ubuntu/' | relative_url }})
+* [FreeBSD]({{ '/docs/installation/freebsd/' | relative_url }})
 * [Other Linux]({{ '/docs/installation/other-linux/' | relative_url }})
 * [Windows]({{ '/docs/installation/windows/' | relative_url }})
\ No newline at end of file
diff --git a/docs/_docs/installation/freebsd.md b/docs/_docs/installation/freebsd.md
new file mode 100644
index 00000000000..37143b86cad
--- /dev/null
+++ b/docs/_docs/installation/freebsd.md
@@ -0,0 +1,50 @@
+---
+title: Jekyll on FreeBSD
+permalink: /docs/installation/freebsd/
+---
+
+### Install Ruby
+
+```sh
+sudo pkg install ruby
+```
+
+### Install Ruby Gems
+
+Find the latest version and install it. (Replace `ruby3x` with whatever the latest version is.)
+
+```sh
+pkg search gems
+sudo pkg install ruby3x-gems
+```
+
+## Set Gems directory and add that to the Bash path
+
+Avoid installing RubyGems packages (called gems) as the root user. Instead,
+set up a gem installation directory for your user account. The following
+commands will add environment variables to your `~/.bashrc` file to configure
+the gem installation path:
+
+```sh
+echo '# Install Ruby Gems to ~/gems' >> ~/.bashrc
+echo 'export GEM_HOME="$HOME/gems"' >> ~/.bashrc
+echo 'export PATH="$HOME/gems/bin:$PATH"' >> ~/.bashrc
+source ~/.bashrc
+```
+
+## Install Jekyll Gems
+
+```sh
+gem install jekyll bundler jekyll-sitemap
+```
+
+## Verify install
+
+Both of these commands should return some output showing version number, etc.
+
+```sh
+ruby -v
+jekyll -v
+```
+
+That's it! You're ready to start using Jekyll.

From 3f3a283018a976da11a0bfcc13a20d43d37ee29f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 3 Nov 2023 15:22:00 -0700
Subject: [PATCH 262/290] Update history to reflect merge of #9481 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index f9700706b4c..5ca11a707b9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -32,6 +32,7 @@
   * Add GitHub Pages helpful notes (#9235)
   * Clarify which version of Jekyll needs 'jekyll-paginate' (#9477)
   * chore: update showcases (#9473)
+  * Add FreeBSD installation instructions (#9481)
 
 ### Development Fixes
 

From 52aab1bc105eab97f43b1ba4d36625b726f17a6b Mon Sep 17 00:00:00 2001
From: Jonas Jared Jacek <78449400+j15k@users.noreply.github.com>
Date: Fri, 1 Dec 2023 17:48:49 +0100
Subject: [PATCH 263/290] Update security.md (#9497)

Merge pull request 9497
---
 docs/_docs/security.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/security.md b/docs/_docs/security.md
index 631a163f9e3..65bf0982d97 100644
--- a/docs/_docs/security.md
+++ b/docs/_docs/security.md
@@ -19,7 +19,7 @@ Security updates are applied to the latest MINOR version of Jekyll, and the vers
 Please report vulnerabilities by sending an email to security@jekyllrb.com with the following information:
 
 1. A description of the vulnerability
-2. Reproduction steps and/or a sample site (share a private repo to the [Jekyll Security Team](docs/pages/team.md))
+2. Reproduction steps and/or a sample site (share a private repo to the [Jekyll Security Team](/team/#security-team))
 3. Your contact information
 
 The Jekyll security team will respond to your submission and notify you whether it has been confirmed by the team.

From 0753e56ec76aa49c297e3694bfca6f76c2338a35 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 1 Dec 2023 08:48:51 -0800
Subject: [PATCH 264/290] Update history to reflect merge of #9497 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 5ca11a707b9..7b4177ed7ec 100644
--- a/History.markdown
+++ b/History.markdown
@@ -33,6 +33,7 @@
   * Clarify which version of Jekyll needs 'jekyll-paginate' (#9477)
   * chore: update showcases (#9473)
   * Add FreeBSD installation instructions (#9481)
+  * Fix broken link for the security team page (#9497)
 
 ### Development Fixes
 

From 432d0e3e7d1c9e34a4e359ad1bbe6fe9cbf1e539 Mon Sep 17 00:00:00 2001
From: Jonas Jared Jacek <78449400+j15k@users.noreply.github.com>
Date: Fri, 1 Dec 2023 17:51:35 +0100
Subject: [PATCH 265/290] Update resources.md (#9496)

Merge pull request 9496
---
 docs/pages/resources.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/pages/resources.md b/docs/pages/resources.md
index eef3556d3b7..7cb27200085 100644
--- a/docs/pages/resources.md
+++ b/docs/pages/resources.md
@@ -37,7 +37,7 @@ Use a SaaS service as a backend for functionality on your Jekyll site
 
 ### Comments
   - [Staticman](https://staticman.net): Add user-generated content to a Jekyll site (free and open source)
-  - [Talkyard](https://www.talkyard.io/blog-comments): Embedded comments for Jekyll and others (free and open source, or hosted serverless)
+  - [Talkyard](https://blog-comments.talkyard.io/): Embedded comments for Jekyll and others (free and open source, or hosted serverless)
 
 ### Content Management
   - [CloudCannon](https://cloudcannon.com/): The Cloud CMS for Jekyll
@@ -45,7 +45,7 @@ Use a SaaS service as a backend for functionality on your Jekyll site
   - [TinaCMS.io](https://tina.io/): Tina is an open-source, Git-backed headless content management system (CMS) that empowers both developers and content creators to collaborate seamlessly on a single platform
   - [Decap CMS](https://decapcms.org/): Decap CMS (formerly Netlify CMS) is an open source content management system for your Git workflow that enables you to provide editors with a friendly UI and intuitive workflows
   - [Siteleaf](https://www.siteleaf.com/): Built for developers, Loved by everyone
-  - [Kentico Kontent](https://github.com/Kentico/kontent-jekyll): A headless CMS with full control over content presentation
+  - [Kentico Kontent](https://rubygems.org/gems/kontent-jekyll/): A headless CMS with full control over content presentation
 
 ### E-commerce
   - [MemberSpace](https://www.memberspace.com/integrations/jekyll-membership/): Add memberships and paywall functionality to a Jekyll site

From 646b4241669ac54247d8bf1ce3e4c616ac71d9fe Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 1 Dec 2023 08:51:37 -0800
Subject: [PATCH 266/290] Update history to reflect merge of #9496 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 7b4177ed7ec..325b96476d0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -34,6 +34,7 @@
   * chore: update showcases (#9473)
   * Add FreeBSD installation instructions (#9481)
   * Fix broken link for the security team page (#9497)
+  * Fix broken links for several Jekyll integrations (#9496)
 
 ### Development Fixes
 

From f9c2395a867ed0643de21a8d3ded6fb494a381aa Mon Sep 17 00:00:00 2001
From: Matt Rogers 
Date: Wed, 27 Dec 2023 14:52:12 -0600
Subject: [PATCH 267/290] Add release post for v4.3.3 (#9511)

Merge pull request 9511
---
 History.markdown                              | 10 ++++++++++
 docs/_config.yml                              |  2 +-
 docs/_docs/history.md                         | 14 ++++++++++++++
 docs/_docs/security.md                        |  2 +-
 .../2023-12-27-jekyll-4-3-3-released.markdown | 19 +++++++++++++++++++
 docs/latest_version.txt                       |  2 +-
 lib/jekyll/version.rb                         |  2 +-
 7 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 docs/_posts/2023-12-27-jekyll-4-3-3-released.markdown

diff --git a/History.markdown b/History.markdown
index 325b96476d0..87832ca4b3e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -71,6 +71,16 @@
   * Add support for upcoming logger 1.4.3 (#9392)
   * Fix typo in devcontainer.json (#9364)
 
+## 4.3.3 / 2023-12-27
+
+### Bug Fixes
+
+  * Backport #9392 for v4.3.x: Fix backward compatibility issues in the Logger (#9510)
+
+### Development Fixes
+
+  * Backport #9237 for v4.3.x: Use Hash explicitly for Struct initializer (#9285)
+
 ## 3.9.3 / 2023-01-29
 
 ### Bug Fixes
diff --git a/docs/_config.yml b/docs/_config.yml
index 4c32125e1f0..68e22caf19d 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,5 +1,5 @@
 ---
-version: 4.3.2
+version: 4.3.3
 name: Jekyll • Simple, blog-aware, static sites
 description: Transform your plain text into static websites and blogs
 url: https://jekyllrb.com
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 4b0d5f921fd..2ccdcc9bb74 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,20 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 4.3.3 / 2023-12-27
+{: #v4-3-3}
+
+### Bug Fixes
+{: #bug-fixes-v4-3-3}
+
+- Backport [#9392]({{ site.repository }}/issues/9392) for v4.3.x: Fix backward compatibility issues in the Logger ([#9510]({{ site.repository }}/issues/9510))
+
+### Development Fixes
+{: #development-fixes-v4-3-3}
+
+- Backport [#9237]({{ site.repository }}/issues/9237) for v4.3.x: Use Hash explicitly for Struct initializer ([#9285]({{ site.repository }}/issues/9285))
+
+
 ## 3.9.3 / 2023-01-29
 {: #v3-9-3}
 
diff --git a/docs/_docs/security.md b/docs/_docs/security.md
index 65bf0982d97..631a163f9e3 100644
--- a/docs/_docs/security.md
+++ b/docs/_docs/security.md
@@ -19,7 +19,7 @@ Security updates are applied to the latest MINOR version of Jekyll, and the vers
 Please report vulnerabilities by sending an email to security@jekyllrb.com with the following information:
 
 1. A description of the vulnerability
-2. Reproduction steps and/or a sample site (share a private repo to the [Jekyll Security Team](/team/#security-team))
+2. Reproduction steps and/or a sample site (share a private repo to the [Jekyll Security Team](docs/pages/team.md))
 3. Your contact information
 
 The Jekyll security team will respond to your submission and notify you whether it has been confirmed by the team.
diff --git a/docs/_posts/2023-12-27-jekyll-4-3-3-released.markdown b/docs/_posts/2023-12-27-jekyll-4-3-3-released.markdown
new file mode 100644
index 00000000000..9435f864d27
--- /dev/null
+++ b/docs/_posts/2023-12-27-jekyll-4-3-3-released.markdown
@@ -0,0 +1,19 @@
+---
+title: 'Jekyll 4.3.3 Released'
+date: 2023-12-27 11:15:00 -0600
+author: mattr-
+version: 4.3.3
+category: release
+---
+
+Hello Jekyllers!
+
+This is a very small release containing two things:
+
+ - A fix for using Jekyll with Ruby 3.3 and the new `logger` gem included with that release.
+ - A test fix for newer versions of Ruby for packagers that run the test suite
+ as part of their packaging process.
+
+Nothing new in the way of features for this release. You'll need to wait for v4.4 for that. 😄
+
+Happy Jekylling!!
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index cc2fbe89b6c..e91d9be2a86 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-4.3.2
+4.3.3
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 73909f4a523..7eb6d310499 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "4.3.2"
+  VERSION = "4.3.3"
 end

From 6d2d29220c6d296f88f27a21241114b1b8fb66f3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 27 Dec 2023 12:52:14 -0800
Subject: [PATCH 268/290] Update history to reflect merge of #9511 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 87832ca4b3e..1542f3df7fb 100644
--- a/History.markdown
+++ b/History.markdown
@@ -35,6 +35,7 @@
   * Add FreeBSD installation instructions (#9481)
   * Fix broken link for the security team page (#9497)
   * Fix broken links for several Jekyll integrations (#9496)
+  * Add release post for v4.3.3 (#9511)
 
 ### Development Fixes
 

From 6c9611d90a5f62907e051ab53db2286ca0554a3a Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 28 Dec 2023 14:58:26 -0800
Subject: [PATCH 269/290] Add Jekyll 3.9.4 release post and changelog

---
 History.markdown                                   |  6 ++++++
 docs/_docs/history.md                              |  9 +++++++++
 .../2023-12-28-jekyll-3-9-4-released.markdown      | 14 ++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 docs/_posts/2023-12-28-jekyll-3-9-4-released.markdown

diff --git a/History.markdown b/History.markdown
index 1542f3df7fb..dbecf393c7f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -82,6 +82,12 @@
 
   * Backport #9237 for v4.3.x: Use Hash explicitly for Struct initializer (#9285)
 
+## 3.9.4 / 2023-12-28
+
+### Bug Fixes
+
+  * Backport #9392 for v3.9.x: Add support for Ruby 3.3 Logger (#9513)
+
 ## 3.9.3 / 2023-01-29
 
 ### Bug Fixes
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 2ccdcc9bb74..a7d1609c266 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -18,6 +18,15 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Backport [#9237]({{ site.repository }}/issues/9237) for v4.3.x: Use Hash explicitly for Struct initializer ([#9285]({{ site.repository }}/issues/9285))
 
 
+## 3.9.4 / 2023-12-28
+{: #v3-9-4}
+
+### Bug Fixes
+{: #bug-fixes-v3-9-4}
+
+- Backport [#9392]({{ site.repository }}/issues/9392) for v3.9.x: Add support for Ruby 3.3 Logger ([#9513]({{ site.repository }}/issues/9513))
+
+
 ## 3.9.3 / 2023-01-29
 {: #v3-9-3}
 
diff --git a/docs/_posts/2023-12-28-jekyll-3-9-4-released.markdown b/docs/_posts/2023-12-28-jekyll-3-9-4-released.markdown
new file mode 100644
index 00000000000..544dd99a711
--- /dev/null
+++ b/docs/_posts/2023-12-28-jekyll-3-9-4-released.markdown
@@ -0,0 +1,14 @@
+---
+title: 'Jekyll 3.9.4 Released'
+date: 2023-12-28 14:45:05 -0800
+author: parkr
+version: 3.9.4
+categories: [release]
+---
+
+Hey Jekyllers!
+
+This release, 3.9.4, is to bring Ruby 3.3 support to Jekyll. You can find
+the details in [the changelog]({% link _docs/history.md %}#v3-9-4).
+
+Happy Jekylling!

From 901256a42c4cd4fb0c23a6393ba58e689d28a64e Mon Sep 17 00:00:00 2001
From: Parker Moore <237985+parkr@users.noreply.github.com>
Date: Thu, 28 Dec 2023 16:34:50 -0800
Subject: [PATCH 270/290] Fix Performance/StringIdentifierArgument violation in
 site.rb and allow activesupport 6 for windows tests (#9512)

Merge pull request 9512
---
 Gemfile            | 2 +-
 lib/jekyll/site.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0669d31cd73..ce2921a1651 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ end
 #
 
 group :test do
-  gem "activesupport", "~> 7.0.0"
+  gem "activesupport", "< 7.1.0"
   gem "cucumber", RUBY_VERSION >= "2.5" ? "~> 5.1.2" : "~> 4.1"
   gem "httpclient"
   gem "jekyll_test_plugin"
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 06031bfdf6e..adec4cc0612 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -49,7 +49,7 @@ def config=(config)
 
       %w(safe lsi highlighter baseurl exclude include future unpublished
          show_drafts limit_posts keep_files).each do |opt|
-        send("#{opt}=", config[opt])
+        send(:"#{opt}=", config[opt])
       end
 
       # keep using `gems` to avoid breaking change

From 3234c1a38a37e1f2b997defcd99f03462182156e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 28 Dec 2023 16:34:51 -0800
Subject: [PATCH 271/290] Update history to reflect merge of #9512 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index dbecf393c7f..57f2d1c760b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -60,6 +60,7 @@
   * Bump Rubocop to 1.56.4 (#9459)
   * Configure dependabot to handle rubygems dependencies (#9445)
   * Update rubocop gem (#9476)
+  * Fix Performance/StringIdentifierArgument violation in site.rb and allow activesupport 6 for windows tests (#9512)
 
 ### Bug Fixes
 

From 2ed5f33da649326ccf647681696cdbf75c7c0d9a Mon Sep 17 00:00:00 2001
From: Michael Nordmeyer 
Date: Fri, 5 Jan 2024 22:57:53 +0100
Subject: [PATCH 272/290] Add docs version to pages_excerpts feature (#9520)

Merge pull request 9520
---
 docs/_docs/pages.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/pages.md b/docs/_docs/pages.md
index 7b217288b84..b4f771d939c 100644
--- a/docs/_docs/pages.md
+++ b/docs/_docs/pages.md
@@ -35,7 +35,6 @@ If you have a lot of pages, you can organize them into subfolders. The same subf
 
 You might want to have a particular folder structure for your source files that changes for the built site. With [permalinks](/docs/permalinks/) you have full control of the output URL.
 
-## Excerpts for pages
+## Excerpts for pages {%- include docs_version_badge.html version="4.1.1" -%}
 
-From Jekyll 4.1.1 onwards, one can *choose* to generate excerpts for their pages by setting `page_excerpts` to `true` in their
-config file.
+One can *choose* to generate excerpts for their pages by setting `page_excerpts` to `true` in their config file.

From 5ae029f9cd565c77d97fcadada2d98d6cf24632b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 5 Jan 2024 13:57:54 -0800
Subject: [PATCH 273/290] Update history to reflect merge of #9520 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 57f2d1c760b..f69ac778349 100644
--- a/History.markdown
+++ b/History.markdown
@@ -36,6 +36,7 @@
   * Fix broken link for the security team page (#9497)
   * Fix broken links for several Jekyll integrations (#9496)
   * Add release post for v4.3.3 (#9511)
+  * Add docs version badge to page_excerpts feature (#9520)
 
 ### Development Fixes
 

From 25fd87c3e26e35a7f0b5868fcf57e8c92d740c26 Mon Sep 17 00:00:00 2001
From: halorrr 
Date: Wed, 10 Jan 2024 12:00:07 -0500
Subject: [PATCH 274/290] add csv to runtime dependency list (#9522)

Merge pull request 9522
---
 jekyll.gemspec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 67333b2b10f..9c5e9dfd206 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -32,6 +32,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version     = ">= 2.5.0"
   s.required_rubygems_version = ">= 2.7.0"
 
+  s.add_dependency("csv",                           "~> 3.0")
+
   s.add_runtime_dependency("addressable",           "~> 2.4")
   s.add_runtime_dependency("colorator",             "~> 1.0")
   s.add_runtime_dependency("em-websocket",          "~> 0.5")

From 108c8419e31ec5adcff0611665fdda9410e796f9 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 10 Jan 2024 09:00:10 -0800
Subject: [PATCH 275/290] Update history to reflect merge of #9522 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index f69ac778349..d103140156e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -62,6 +62,7 @@
   * Configure dependabot to handle rubygems dependencies (#9445)
   * Update rubocop gem (#9476)
   * Fix Performance/StringIdentifierArgument violation in site.rb and allow activesupport 6 for windows tests (#9512)
+  * Add csv to runtime dependency list (#9522)
 
 ### Bug Fixes
 

From 55e993be2594e3bfbd71825fc4dbfbd6e5b0621c Mon Sep 17 00:00:00 2001
From: Daniel Haim <2808046+danielhaim1@users.noreply.github.com>
Date: Fri, 12 Jan 2024 17:57:15 +0100
Subject: [PATCH 276/290] Improve accessibility of the docs (#9338)

Merge pull request 9338
---
 docs/_includes/anchor_links.html              | 54 +++++++++----------
 docs/_includes/docs_contents.html             | 17 +++---
 docs/_includes/docs_contents_mobile.html      | 24 ++++-----
 docs/_includes/mobile-nav-items.html          |  8 +--
 docs/_includes/news_contents_mobile.html      |  4 +-
 docs/_includes/news_item.html                 | 12 ++---
 docs/_includes/news_item_archive.html         | 12 ++---
 docs/_includes/search/input.html              |  2 +-
 docs/_includes/search/script.html             |  4 +-
 docs/_includes/top.html                       |  4 +-
 docs/_includes/tutorials_contents_mobile.html | 18 +++----
 docs/_layouts/default.html                    | 11 ++++
 docs/_layouts/news_item.html                  | 12 ++---
 13 files changed, 98 insertions(+), 84 deletions(-)

diff --git a/docs/_includes/anchor_links.html b/docs/_includes/anchor_links.html
index c584ce5d7c8..918ac9035cc 100644
--- a/docs/_includes/anchor_links.html
+++ b/docs/_includes/anchor_links.html
@@ -1,33 +1,33 @@
 
diff --git a/docs/_includes/docs_contents.html b/docs/_includes/docs_contents.html
index 931500a90b2..8b7b19dacab 100644
--- a/docs/_includes/docs_contents.html
+++ b/docs/_includes/docs_contents.html
@@ -1,14 +1,17 @@
 
    
   
diff --git a/docs/_includes/docs_contents_mobile.html b/docs/_includes/docs_contents_mobile.html
index 6574b6a940b..a8c2b3b6d6a 100644
--- a/docs/_includes/docs_contents_mobile.html
+++ b/docs/_includes/docs_contents_mobile.html
@@ -1,15 +1,15 @@
 
    
-  
     
-    {% for section in site.data.docs_nav -%}
-    
-    {%- for item in section.docs -%}
-      {% assign p = site.docs | where: "url", item.link | first %}
-      
-    {%- endfor %}
-    
-    {% endfor -%}
+    {% for section in site.data.docs_nav %}
+      
+        {%- for item in section.docs -%}
+          {% assign page = site.docs | where: "url", item.link | first %}
+          
+        {%- endfor %}
+      
+    {% endfor %}
   
-
    
+
    
\ No newline at end of file
diff --git a/docs/_includes/mobile-nav-items.html b/docs/_includes/mobile-nav-items.html
index 5dd9b86d206..ca337ba378d 100644
--- a/docs/_includes/mobile-nav-items.html
+++ b/docs/_includes/mobile-nav-items.html
@@ -3,12 +3,12 @@
     {% if p.show_on_mobile -%}
     
  • {{ p.title }}
    • 
     {% endif -%}
   {% endfor -%}
-  
  • GitHub
    • 
-
+  
  • GitHub
    • 
+
\ No newline at end of file
diff --git a/docs/_includes/news_contents_mobile.html b/docs/_includes/news_contents_mobile.html
index 84972788ac5..6f6a98e4734 100644
--- a/docs/_includes/news_contents_mobile.html
+++ b/docs/_includes/news_contents_mobile.html
@@ -1,5 +1,5 @@
 
    
-  
     
     
     
@@ -8,4 +8,4 @@
       {% endfor -%}
     
   
-
    
+
    
\ No newline at end of file
diff --git a/docs/_includes/news_item.html b/docs/_includes/news_item.html
index 51bc9cdff1f..6529a5f7a6a 100644
--- a/docs/_includes/news_item.html
+++ b/docs/_includes/news_item.html
@@ -1,5 +1,5 @@
-
    
-  
    
+
diff --git a/docs/_includes/news_item_archive.html b/docs/_includes/news_item_archive.html
index bccf6523d84..c5e865455ff 100644
--- a/docs/_includes/news_item_archive.html
+++ b/docs/_includes/news_item_archive.html
@@ -1,4 +1,4 @@
-
    
+
    
   
    
     
       
@@ -8,18 +8,18 @@
   
    
   
    
     
    
-      
    
-        
+      
    
+        
       
    
-      
+      
       {% assign author = post.author -%}
-      
+      
     
    
   
    
diff --git a/docs/_includes/search/input.html b/docs/_includes/search/input.html
index 729f5cabdfd..65015ee406c 100644
--- a/docs/_includes/search/input.html
+++ b/docs/_includes/search/input.html
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/docs/_includes/search/script.html b/docs/_includes/search/script.html
index dca756d7709..7ddd1280fed 100644
--- a/docs/_includes/search/script.html
+++ b/docs/_includes/search/script.html
@@ -1,9 +1,9 @@
-
+
 
diff --git a/docs/_includes/top.html b/docs/_includes/top.html
index c0e203c33f4..0868d0cf43d 100644
--- a/docs/_includes/top.html
+++ b/docs/_includes/top.html
@@ -1,5 +1,5 @@
-
-
+
+
 
   
   
diff --git a/docs/_includes/tutorials_contents_mobile.html b/docs/_includes/tutorials_contents_mobile.html
index 080788d5fe4..4a8a9478382 100644
--- a/docs/_includes/tutorials_contents_mobile.html
+++ b/docs/_includes/tutorials_contents_mobile.html
@@ -1,14 +1,14 @@
 
    
-  
     
     {% for section in site.data.tutorials -%}
-    
-      {% for item in section.tutorials -%}
-        {% assign item_url = item | prepend:"/tutorials/" | append:"/" -%}
-        {% assign tutorial = site.tutorials | where: "url", item_url | first -%}
-        
-      {% endfor -%}
-    
+      
+        {% for item in section.tutorials -%}
+          {% assign item_url = item | prepend:"/tutorials/" | append:"/" -%}
+          {% assign tutorial = site.tutorials | where: "url", item_url | first -%}
+          
+        {% endfor -%}
+      
     {% endfor -%}
   
-
    
+
    
\ No newline at end of file
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 9234c13c754..fb30f981d0a 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -9,5 +9,16 @@
   {%- include anchor_links.html -%}
   {%- include analytics.html -%}
   {%- include search/script.html -%}
+  
+  
 
 
diff --git a/docs/_layouts/news_item.html b/docs/_layouts/news_item.html
index 5b0960e97b6..7be7bf76bc9 100644
--- a/docs/_layouts/news_item.html
+++ b/docs/_layouts/news_item.html
@@ -2,8 +2,8 @@
 layout: news
 ---
 
-
    
-  
    
+

From 839007fa158ccd8d78fc956f9f265c249865a91a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 12 Jan 2024 08:57:17 -0800
Subject: [PATCH 277/290] Update history to reflect merge of #9338 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index d103140156e..ec304e9bc3d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -37,6 +37,7 @@
   * Fix broken links for several Jekyll integrations (#9496)
   * Add release post for v4.3.3 (#9511)
   * Add docs version badge to page_excerpts feature (#9520)
+  * Improve accessibility of the docs (#9338)
 
 ### Development Fixes
 

From 01da87c5f9c466205a4ebbc4747e390616585c3c Mon Sep 17 00:00:00 2001
From: Akira Taguchi 
Date: Fri, 12 Jan 2024 19:05:00 +0200
Subject: [PATCH 278/290] Fix gem quote consistency on docs (#9517)

Merge pull request 9517
---
 docs/_docs/continuous-integration/circleci.md         | 4 ++--
 docs/_docs/continuous-integration/github-actions.md   | 4 ++--
 docs/_docs/installation/windows.md                    | 2 +-
 docs/_docs/step-by-step/10-deployment.md              | 8 ++++----
 docs/_docs/upgrading/2-to-3.md                        | 2 +-
 docs/_posts/2019-08-19-jekyll-4-0-0-released.markdown | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/_docs/continuous-integration/circleci.md b/docs/_docs/continuous-integration/circleci.md
index fb1275a5c8f..d2e317df181 100644
--- a/docs/_docs/continuous-integration/circleci.md
+++ b/docs/_docs/continuous-integration/circleci.md
@@ -30,8 +30,8 @@ source 'https://rubygems.org'
 
 ruby '2.7.4'
 
-gem 'jekyll'
-gem 'html-proofer'
+gem "jekyll"
+gem "html-proofer"
 ```
 
 ```yaml
diff --git a/docs/_docs/continuous-integration/github-actions.md b/docs/_docs/continuous-integration/github-actions.md
index 932f7ebbb72..caba322f9ff 100644
--- a/docs/_docs/continuous-integration/github-actions.md
+++ b/docs/_docs/continuous-integration/github-actions.md
@@ -61,10 +61,10 @@ Welcome to My Home Page
 
 source 'https://rubygems.org'
 
-gem 'jekyll', '~> 4.2'
+gem "jekyll", "~> 4.2"
 
 group :jekyll_plugins do
-  gem 'jekyll-timeago', '~> 0.13.1'
+  gem "jekyll-timeago", "~> 0.13.1"
 end
 ```
 
diff --git a/docs/_docs/installation/windows.md b/docs/_docs/installation/windows.md
index 6e3e5b1a0c0..1a4920f382e 100644
--- a/docs/_docs/installation/windows.md
+++ b/docs/_docs/installation/windows.md
@@ -138,7 +138,7 @@ While `listen` has built-in support for UNIX systems, it may require an extra ge
 Add the following to the `Gemfile` for your site if you have issues with auto-regeneration on Windows alone:
 
 ```ruby
-gem 'wdm', '~> 0.1.1', :install_if => Gem.win_platform?
+gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform?
 ```
 
 You have to use a [Ruby+Devkit](https://rubyinstaller.org/downloads/) version of the RubyInstaller and install
diff --git a/docs/_docs/step-by-step/10-deployment.md b/docs/_docs/step-by-step/10-deployment.md
index 7fd0d08fe37..6c41f4e0831 100644
--- a/docs/_docs/step-by-step/10-deployment.md
+++ b/docs/_docs/step-by-step/10-deployment.md
@@ -68,12 +68,12 @@ in a `jekyll_plugins` group they'll automatically be required into Jekyll:
 ```ruby
 source 'https://rubygems.org'
 
-gem 'jekyll'
+gem "jekyll"
 
 group :jekyll_plugins do
-  gem 'jekyll-sitemap'
-  gem 'jekyll-feed'
-  gem 'jekyll-seo-tag'
+  gem "jekyll-sitemap"
+  gem "jekyll-feed"
+  gem "jekyll-seo-tag"
 end
 ```
 
diff --git a/docs/_docs/upgrading/2-to-3.md b/docs/_docs/upgrading/2-to-3.md
index 5c5d5ded8ce..2426a5762f2 100644
--- a/docs/_docs/upgrading/2-to-3.md
+++ b/docs/_docs/upgrading/2-to-3.md
@@ -93,7 +93,7 @@ it's now [Rouge](https://github.com/rouge-ruby/rouge). If you were using the `hi
 options, such as `hl_lines`, they may not be available when using Rouge. To
 go back to using Pygments, set `highlighter: pygments` in your
 `_config.yml` file and run `gem install pygments.rb` or add
-`gem 'pygments.rb'` to your project's `Gemfile`.
+`gem "pygments.rb"` to your project's `Gemfile`.
 
 ### Relative Permalink support removed
 
diff --git a/docs/_posts/2019-08-19-jekyll-4-0-0-released.markdown b/docs/_posts/2019-08-19-jekyll-4-0-0-released.markdown
index dec7401e18d..fe3a84ee012 100644
--- a/docs/_posts/2019-08-19-jekyll-4-0-0-released.markdown
+++ b/docs/_posts/2019-08-19-jekyll-4-0-0-released.markdown
@@ -82,7 +82,7 @@ First, read the [upgrade guide](/docs/upgrading/3-to-4/)!
 Next, Edit your project's `Gemfile` to test Jekyll v4.x:
 
 ```ruby
-gem "jekyll", "~> 4.0"
+gem 'jekyll', '~> 4.0'
 ```
 
 Then run `bundle update` to update all dependencies. Unless you're using

From 42dd477f8a449b16cacb94e4d966000106718430 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 12 Jan 2024 09:05:01 -0800
Subject: [PATCH 279/290] Update history to reflect merge of #9517 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index ec304e9bc3d..df7e316ba8e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -38,6 +38,7 @@
   * Add release post for v4.3.3 (#9511)
   * Add docs version badge to page_excerpts feature (#9520)
   * Improve accessibility of the docs (#9338)
+  * Fix gem quote consistency on docs (#9517)
 
 ### Development Fixes
 

From db3437a34fb9a050a758ed7b6eda90ab302c264d Mon Sep 17 00:00:00 2001
From: Matt Rogers 
Date: Fri, 12 Jan 2024 20:48:56 -0600
Subject: [PATCH 280/290] chore: Bump the required ruby version to 2.7 (#9525)

Merge pull request 9525
---
 jekyll.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 9c5e9dfd206..bd60d43068a 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.rdoc_options     = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w(README.markdown LICENSE)
 
-  s.required_ruby_version     = ">= 2.5.0"
+  s.required_ruby_version     = ">= 2.7.0"
   s.required_rubygems_version = ">= 2.7.0"
 
   s.add_dependency("csv",                           "~> 3.0")

From b38b7a14798d7231db8ef77d29db1eedeed51f47 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 12 Jan 2024 18:48:58 -0800
Subject: [PATCH 281/290] Update history to reflect merge of #9525 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index df7e316ba8e..699a60c5097 100644
--- a/History.markdown
+++ b/History.markdown
@@ -76,6 +76,7 @@
   * Handle TypeError from `where` filter gracefully (#9292)
   * Add support for upcoming logger 1.4.3 (#9392)
   * Fix typo in devcontainer.json (#9364)
+  * Bump the minimum ruby version to 2.7 (#9525)
 
 ## 4.3.3 / 2023-12-27
 

From 8f2b53172f233507cc624313a0d2a34d77c96a15 Mon Sep 17 00:00:00 2001
From: Matt Rogers 
Date: Wed, 17 Jan 2024 00:58:28 -0600
Subject: [PATCH 282/290] fix: make search work again (#9530)

Merge pull request 9530
---
 docs/_includes/search/script.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_includes/search/script.html b/docs/_includes/search/script.html
index 7ddd1280fed..dca756d7709 100644
--- a/docs/_includes/search/script.html
+++ b/docs/_includes/search/script.html
@@ -1,9 +1,9 @@
-
+
 

From 860d730ff33d31a4e922da0e08b46f25434ba59a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 16 Jan 2024 22:58:30 -0800
Subject: [PATCH 283/290] Update history to reflect merge of #9530 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 699a60c5097..f709c1e843b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -39,6 +39,7 @@
   * Add docs version badge to page_excerpts feature (#9520)
   * Improve accessibility of the docs (#9338)
   * Fix gem quote consistency on docs (#9517)
+  * Make site search work again (#9530)
 
 ### Development Fixes
 

From 84a29bd1429819416bc6454b1374be67b7043bdb Mon Sep 17 00:00:00 2001
From: Parker Moore <237985+parkr@users.noreply.github.com>
Date: Tue, 23 Jan 2024 10:53:21 -0800
Subject: [PATCH 284/290] Add a few more emeritus team members (#9535)

Merge pull request 9535
---
 docs/pages/team.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/pages/team.md b/docs/pages/team.md
index 901eb729f46..279df20a485 100644
--- a/docs/pages/team.md
+++ b/docs/pages/team.md
@@ -26,7 +26,10 @@ patch security vulnerabilities reported to them._
 _Emeritus Core Team Members were once members of Jekyll's Core Team._
 
 * Alfred (@alfredxing)
+* Ben (@benbalter)
 * Frank (@DirtyF)
 * Nick (@qrush)
+* Olivia
 * Parker (@parkr)
+* Pat (@pathawks)
 * Tom (@mojombo)

From 12ab35011f6e86d49c7781514f9dd1d92e43ea11 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 23 Jan 2024 10:53:22 -0800
Subject: [PATCH 285/290] Update history to reflect merge of #9535 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index f709c1e843b..77e56558303 100644
--- a/History.markdown
+++ b/History.markdown
@@ -66,6 +66,7 @@
   * Update rubocop gem (#9476)
   * Fix Performance/StringIdentifierArgument violation in site.rb and allow activesupport 6 for windows tests (#9512)
   * Add csv to runtime dependency list (#9522)
+  * Add a few more emeritus team members (#9535)
 
 ### Bug Fixes
 

From 22c756a2e06d63d71ccda2e389fbfda915df6c25 Mon Sep 17 00:00:00 2001
From: velle 
Date: Tue, 13 Feb 2024 04:01:16 +0100
Subject: [PATCH 286/290] Jekyll docs template typo - All pages show
 "Deployment" (#9548)

Merge pull request 9548
---
 docs/_includes/docs_contents.html        | 8 ++++----
 docs/_includes/docs_contents_mobile.html | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/_includes/docs_contents.html b/docs/_includes/docs_contents.html
index 8b7b19dacab..0bbdb1dc059 100644
--- a/docs/_includes/docs_contents.html
+++ b/docs/_includes/docs_contents.html
@@ -4,13 +4,13 @@
       
    {{ section.title }}
    
       
     {% endfor -%}
diff --git a/docs/_includes/docs_contents_mobile.html b/docs/_includes/docs_contents_mobile.html
index a8c2b3b6d6a..a639c53b2d0 100644
--- a/docs/_includes/docs_contents_mobile.html
+++ b/docs/_includes/docs_contents_mobile.html
@@ -4,12 +4,12 @@
     {% for section in site.data.docs_nav %}
       
         {%- for item in section.docs -%}
-          {% assign page = site.docs | where: "url", item.link | first %}
-          
         {%- endfor %}
       
     {% endfor %}
   
-
    
\ No newline at end of file
+
    

From c7e9061da3f0c60ead24ee887ae10db56c47c3df Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 12 Feb 2024 19:01:18 -0800
Subject: [PATCH 287/290] Update history to reflect merge of #9548 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 77e56558303..edf9d4eef35 100644
--- a/History.markdown
+++ b/History.markdown
@@ -40,6 +40,7 @@
   * Improve accessibility of the docs (#9338)
   * Fix gem quote consistency on docs (#9517)
   * Make site search work again (#9530)
+  * Jekyll docs template typo - All pages show "Deployment" (#9548)
 
 ### Development Fixes
 

From dbbfc5d48c81cf424f29c7b0eebf10886bc99904 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 12 Feb 2024 20:19:22 -0800
Subject: [PATCH 288/290] Update history to reflect merge of #9550 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index edf9d4eef35..0ca20bb2d05 100644
--- a/History.markdown
+++ b/History.markdown
@@ -3,6 +3,7 @@
 ### Minor Enhancements
 
   * Allow marking specific highlighted lines via Liquid (#9138)
+  * 3.9-stable: allow Pages to be Excerpted (#9550)
 
 ### Documentation
 

From c85bd153407a238df4ac79fedfa19f340dc5a4e4 Mon Sep 17 00:00:00 2001
From: a story 
Date: Wed, 24 Apr 2024 02:58:59 +0800
Subject: [PATCH 289/290] Fixed: Wrong navigation style on the right side of
 news and docs pages (#9586)

Merge pull request 9586
---
 docs/_includes/docs_contents.html | 2 +-
 docs/_includes/news_contents.html | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/_includes/docs_contents.html b/docs/_includes/docs_contents.html
index 0bbdb1dc059..04cb94f0a0a 100644
--- a/docs/_includes/docs_contents.html
+++ b/docs/_includes/docs_contents.html
@@ -10,7 +10,7 @@ 
    {{ section.title }}
    
               {{ item_page.menu_name | default: item_page.title }}
             
           {% endcapture %}
-          {{ item_html }}
+          {{ item_html }}
         {% endfor %}
       
     {% endfor -%}
diff --git a/docs/_includes/news_contents.html b/docs/_includes/news_contents.html
index ea0a558e401..e8f7ed17f2a 100644
--- a/docs/_includes/news_contents.html
+++ b/docs/_includes/news_contents.html
@@ -1,10 +1,10 @@