+ The contents of _site are automatically cleaned, by default, when
+ the site is built. Files or folders that are not created by your site's build
+ process will be removed.
+
+ Some files could be retained by specifying them within the keep_files
+ configuration directive. Other files could be retained by keeping them in your
+ assets directory.
+
Install Jekyll
" in "_site/just-text-excerpt.html" - And I should see "Alpha 1
" in "_site/text-and-footnote.html" + And I should see "Alpha 1
" in "_site/text-and-footnote.html" And I should see "Omega sigma ↩
" in "_site/text-and-footnote.html" And I should see "Read docs
" in "_site/text-and-reference-link.html" And I should see "Check out jekyll
" in "_site/text-and-self-refencing-link.html" diff --git a/features/rendering.feature b/features/rendering.feature index e13fe17f5a7..4639e3b0968 100644 --- a/features/rendering.feature +++ b/features/rendering.feature @@ -207,3 +207,35 @@ Feature: Rendering And I should see "series named {{ site.title }}" in "_site/index.html" And I should see "{% link series/first-part.md %}" in "_site/index.html" And I should see "{% link series/last-part.md %}" in "_site/index.html" + + Scenario: Render content of another page + Given I have an "index.md" page that contains "__Hello World__" + And I have an "about.md" page that contains "{{ page.name }}" + And I have a "test.json" file with content: + """ + --- + --- + + { + "hpages": [ + {%- for page in site.html_pages %} + { + "url" : {{ page.url | jsonify }}, + "name" : {{ page.name | jsonify }}, + "path" : {{ page.path | jsonify }}, + "title" : {{ page.title | jsonify }}, + "layout" : {{ page.layout | jsonify }}, + "content": {{ page.content | jsonify }}, + "excerpt": {{ page.excerpt | jsonify }} + }{% unless forloop.last %},{% endunless -%} + {% endfor %} + ] + } + """ + When I run jekyll build + Then I should get a zero exit status + And the _site directory should exist + But I should not see "content\": \"{{ page.name }}" in "_site/test.json" + And I should not see "content\": \"__Hello World__" in "_site/test.json" + But I should see "content\": \"about.md
" in "_site/test.json" + And I should see "content\": \"Hello World
" in "_site/test.json" diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb index 4623ddafba4..150b4aa7360 100644 --- a/lib/jekyll/commands/new.rb +++ b/lib/jekyll/commands/new.rb @@ -99,6 +99,9 @@ def gemfile_contents # Performance-booster for watching directories on Windows gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] + # Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem + # do not have a Java counterpart. + gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby] RUBY end diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index c3d0621aec5..7357b9398bf 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -249,9 +249,6 @@ def format_url(ssl_enabled, address, port, baseurl = nil) def default_url(opts) config = configuration_from_options(opts) - auth = config.values_at("host", "port").join(":") - return config["url"] if auth == "127.0.0.1:4000" - format_url( config["ssl_cert"] && config["ssl_key"], config["host"] == "127.0.0.1" ? "localhost" : config["host"], diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index 905afe573ff..b9f7a93fbd7 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -112,7 +112,11 @@ def render_liquid(content, payload, info, path) # # Returns the Hash representation of this Convertible. def to_liquid(attrs = nil) - further_data = attribute_hash(attrs || self.class::ATTRIBUTES_FOR_LIQUID) + further_data = \ + (attrs || self.class::ATTRIBUTES_FOR_LIQUID).each_with_object({}) do |attribute, hsh| + hsh[attribute] = send(attribute) + end + Utils.deep_merge_hashes defaults, Utils.deep_merge_hashes(data, further_data) end @@ -246,13 +250,6 @@ def defaults @defaults ||= site.frontmatter_defaults.all(relative_path, type) end - def attribute_hash(attrs) - @attribute_hash ||= {} - @attribute_hash[attrs] ||= attrs.each_with_object({}) do |attribute, hsh| - hsh[attribute] = send(attribute) - end - end - def no_layout? data["layout"] == "none" end diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb index 1c3b86fe3f4..cda2ef4e8c6 100644 --- a/lib/jekyll/tags/include.rb +++ b/lib/jekyll/tags/include.rb @@ -234,12 +234,17 @@ def realpath_prefixed_with?(path, dir) end def add_include_to_dependency(inclusion, context) - return unless context.registers[:page]&.key?("path") + 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( - @site.in_source_dir(context.registers[:page]["path"]), - inclusion.path - ) + @site.regenerator.add_dependency(absolute_path, inclusion.path) end end diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index 1b23b987f93..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.0" + VERSION = "4.2.2" end diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb index d9286a93b67..455eb703673 100644 --- a/test/test_commands_serve.rb +++ b/test/test_commands_serve.rb @@ -232,6 +232,12 @@ def serve(opts) expect(Jekyll).to receive(:env).and_return("development") expect(Jekyll::Commands::Serve).to receive(:start_up_webrick) end + should "set the site url by default to `http://localhost:4000`" do + @merc.execute(:serve, "watch" => false, "url" => "https://jekyllrb.com/") + + assert_equal 1, Jekyll.sites.count + assert_equal "http://localhost:4000", Jekyll.sites.first.config["url"] + end should "take `host`, `port` and `ssl` into consideration if set" do @merc.execute(:serve,