diff --git a/packages/cli/test/functional/test_site/expected/bugs/index.html b/packages/cli/test/functional/test_site/expected/bugs/index.html index 55b3876aea..b624d60088 100644 --- a/packages/cli/test/functional/test_site/expected/bugs/index.html +++ b/packages/cli/test/functional/test_site/expected/bugs/index.html @@ -11,18 +11,18 @@ Open Bugs - - - - - - - - - - + + + + + + + + + + - + @@ -231,7 +231,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/index.html b/packages/cli/test/functional/test_site/expected/index.html index d6d1a320c8..98e73cebe2 100644 --- a/packages/cli/test/functional/test_site/expected/index.html +++ b/packages/cli/test/functional/test_site/expected/index.html @@ -11,18 +11,18 @@ Hello World - - - - - - - - - - + + + + + + + + + + - + @@ -804,7 +804,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/sub_site/index.html b/packages/cli/test/functional/test_site/expected/sub_site/index.html index 7e93265d7a..fb2b39c005 100644 --- a/packages/cli/test/functional/test_site/expected/sub_site/index.html +++ b/packages/cli/test/functional/test_site/expected/sub_site/index.html @@ -11,18 +11,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -239,7 +239,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/index.html b/packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/index.html index 99cc4c5f14..4c193b8b25 100644 --- a/packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/index.html +++ b/packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/index.html @@ -11,18 +11,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -230,7 +230,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/testNunjucksPathResolving.html b/packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/testNunjucksPathResolving.html index f210d50cbd..0c948c6338 100644 --- a/packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/testNunjucksPathResolving.html +++ b/packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/testNunjucksPathResolving.html @@ -11,18 +11,18 @@ Hello World - - - - - - - - - - + + + + + + + + + + - + @@ -235,7 +235,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/sub_site/testNunjucksPathResolving.html b/packages/cli/test/functional/test_site/expected/sub_site/testNunjucksPathResolving.html index bab0ba3bfa..0c948c6338 100644 --- a/packages/cli/test/functional/test_site/expected/sub_site/testNunjucksPathResolving.html +++ b/packages/cli/test/functional/test_site/expected/sub_site/testNunjucksPathResolving.html @@ -11,18 +11,18 @@ Hello World - - - - - - - - - - + + + + + + + + + + - + @@ -235,7 +235,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testAnchorGeneration.html b/packages/cli/test/functional/test_site/expected/testAnchorGeneration.html index 5294fc35a5..e8ae389f7d 100644 --- a/packages/cli/test/functional/test_site/expected/testAnchorGeneration.html +++ b/packages/cli/test/functional/test_site/expected/testAnchorGeneration.html @@ -11,18 +11,18 @@ Anchor Generation Test - - - - - - - - - - + + + + + + + + + + - + @@ -297,7 +297,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testAnnotate.html b/packages/cli/test/functional/test_site/expected/testAnnotate.html index 6623f4436a..4a0c392e61 100644 --- a/packages/cli/test/functional/test_site/expected/testAnnotate.html +++ b/packages/cli/test/functional/test_site/expected/testAnnotate.html @@ -11,18 +11,18 @@ Annotate Feature Test - - - - - - - - - - + + + + + + + + + + - + @@ -284,7 +284,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testAntiFOUCStyles.html b/packages/cli/test/functional/test_site/expected/testAntiFOUCStyles.html index 3830c1a191..d8d3ed09b7 100644 --- a/packages/cli/test/functional/test_site/expected/testAntiFOUCStyles.html +++ b/packages/cli/test/functional/test_site/expected/testAntiFOUCStyles.html @@ -11,18 +11,18 @@ Hello World - - - - - - - - - - + + + + + + + + + + - + @@ -252,7 +252,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testCenterText.html b/packages/cli/test/functional/test_site/expected/testCenterText.html index ca8076d7c2..87d0509b94 100644 --- a/packages/cli/test/functional/test_site/expected/testCenterText.html +++ b/packages/cli/test/functional/test_site/expected/testCenterText.html @@ -11,18 +11,18 @@ Center-aligned text test - - - - - - - - - - + + + + + + + + + + - + @@ -228,7 +228,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testCodeBlocks.html b/packages/cli/test/functional/test_site/expected/testCodeBlocks.html index e72200ed8e..7529a6a4a1 100644 --- a/packages/cli/test/functional/test_site/expected/testCodeBlocks.html +++ b/packages/cli/test/functional/test_site/expected/testCodeBlocks.html @@ -11,18 +11,18 @@ Test: Code Blocks - - - - - - - - - - + + + + + + + + + + - + @@ -420,7 +420,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testDates.html b/packages/cli/test/functional/test_site/expected/testDates.html index 363cf6a683..c6cc8641e3 100644 --- a/packages/cli/test/functional/test_site/expected/testDates.html +++ b/packages/cli/test/functional/test_site/expected/testDates.html @@ -11,18 +11,18 @@ Nunjucks date filter tests - - - - - - - - - - + + + + + + + + + + - + @@ -234,7 +234,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testEmptyFrontmatter.html b/packages/cli/test/functional/test_site/expected/testEmptyFrontmatter.html index 2cfc0965e7..def9d790df 100644 --- a/packages/cli/test/functional/test_site/expected/testEmptyFrontmatter.html +++ b/packages/cli/test/functional/test_site/expected/testEmptyFrontmatter.html @@ -14,18 +14,18 @@ Hello World - - - - - - - - - - + + + + + + + + + + - + @@ -235,7 +235,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testExternalScripts.html b/packages/cli/test/functional/test_site/expected/testExternalScripts.html index c54045462c..53b246e87f 100644 --- a/packages/cli/test/functional/test_site/expected/testExternalScripts.html +++ b/packages/cli/test/functional/test_site/expected/testExternalScripts.html @@ -14,18 +14,18 @@ Hello World - - - - - - - - - - + + + + + + + + + + - + @@ -238,7 +238,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testHr.html b/packages/cli/test/functional/test_site/expected/testHr.html index 296524fecb..e86b77efa3 100644 --- a/packages/cli/test/functional/test_site/expected/testHr.html +++ b/packages/cli/test/functional/test_site/expected/testHr.html @@ -11,18 +11,18 @@ create different types of horizontal rules - - - - - - - - - - + + + + + + + + + + - + @@ -237,7 +237,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testIncludeBoilerplate.html b/packages/cli/test/functional/test_site/expected/testIncludeBoilerplate.html index 3f5cbf97a6..569847a7b0 100644 --- a/packages/cli/test/functional/test_site/expected/testIncludeBoilerplate.html +++ b/packages/cli/test/functional/test_site/expected/testIncludeBoilerplate.html @@ -11,18 +11,18 @@ Content inside <include> should not be processed by markdown - - - - - - - - - - + + + + + + + + + + - + @@ -319,7 +319,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testIncludeMultipleModals.html b/packages/cli/test/functional/test_site/expected/testIncludeMultipleModals.html index 59dfa14484..aca6bac2da 100644 --- a/packages/cli/test/functional/test_site/expected/testIncludeMultipleModals.html +++ b/packages/cli/test/functional/test_site/expected/testIncludeMultipleModals.html @@ -11,18 +11,18 @@ Multiple inclusions of a modal should be supported - - - - - - - - - - + + + + + + + + + + - + @@ -234,7 +234,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testIncludePluginsRendered.html b/packages/cli/test/functional/test_site/expected/testIncludePluginsRendered.html index c3873b9436..a450362407 100644 --- a/packages/cli/test/functional/test_site/expected/testIncludePluginsRendered.html +++ b/packages/cli/test/functional/test_site/expected/testIncludePluginsRendered.html @@ -11,18 +11,18 @@ Included files should have plugins rendered on them - - - - - - - - - - + + + + + + + + + + - + @@ -229,7 +229,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testLayouts.html b/packages/cli/test/functional/test_site/expected/testLayouts.html index 220d03c179..5e460f1507 100644 --- a/packages/cli/test/functional/test_site/expected/testLayouts.html +++ b/packages/cli/test/functional/test_site/expected/testLayouts.html @@ -14,18 +14,18 @@ Test nunjucks path resolving - - - - - - - - - - + + + + + + + + + + - + @@ -235,7 +235,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testLayoutsOverride.html b/packages/cli/test/functional/test_site/expected/testLayoutsOverride.html index bbee1e1bb9..55630e4247 100644 --- a/packages/cli/test/functional/test_site/expected/testLayoutsOverride.html +++ b/packages/cli/test/functional/test_site/expected/testLayoutsOverride.html @@ -14,18 +14,18 @@ Hello World - - - - - - - - - - + + + + + + + + + + - + @@ -235,7 +235,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testLinks.html b/packages/cli/test/functional/test_site/expected/testLinks.html index b184f08074..30525fc988 100644 --- a/packages/cli/test/functional/test_site/expected/testLinks.html +++ b/packages/cli/test/functional/test_site/expected/testLinks.html @@ -11,18 +11,18 @@ Autolink tests - - - - - - - - - - + + + + + + + + + + - + @@ -238,7 +238,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testMath.html b/packages/cli/test/functional/test_site/expected/testMath.html index 8d0fb70f67..9d2326c6de 100644 --- a/packages/cli/test/functional/test_site/expected/testMath.html +++ b/packages/cli/test/functional/test_site/expected/testMath.html @@ -11,18 +11,18 @@ Math formulae should be displayed correctly, with additional plugin - - - - - - - - - - + + + + + + + + + + - + @@ -494,7 +494,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testModals.html b/packages/cli/test/functional/test_site/expected/testModals.html index f02d4f18c4..d32e7a23b7 100644 --- a/packages/cli/test/functional/test_site/expected/testModals.html +++ b/packages/cli/test/functional/test_site/expected/testModals.html @@ -11,18 +11,18 @@ Test: Modals - - - - - - - - - - + + + + + + + + + + - + @@ -370,7 +370,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testNunjucksPathResolving.html b/packages/cli/test/functional/test_site/expected/testNunjucksPathResolving.html index 37c7784a64..0c948c6338 100644 --- a/packages/cli/test/functional/test_site/expected/testNunjucksPathResolving.html +++ b/packages/cli/test/functional/test_site/expected/testNunjucksPathResolving.html @@ -11,18 +11,18 @@ Hello World - - - - - - - - - - + + + + + + + + + + - + @@ -235,7 +235,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testPageNav.html b/packages/cli/test/functional/test_site/expected/testPageNav.html index f9f19681f7..0fc384bc67 100644 --- a/packages/cli/test/functional/test_site/expected/testPageNav.html +++ b/packages/cli/test/functional/test_site/expected/testPageNav.html @@ -11,18 +11,18 @@ text interpolation should be skipped appropriately - - - - - - - - - - + + + + + + + + + + - + @@ -243,7 +243,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testPanelMarkdownParsing.html b/packages/cli/test/functional/test_site/expected/testPanelMarkdownParsing.html index f709805285..6be480a460 100644 --- a/packages/cli/test/functional/test_site/expected/testPanelMarkdownParsing.html +++ b/packages/cli/test/functional/test_site/expected/testPanelMarkdownParsing.html @@ -11,18 +11,18 @@ markdown-it should parse minimized panel as inline element and normal panel as block element - - - - - - - - - - + + + + + + + + + + - + @@ -285,7 +285,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testPlantUML.html b/packages/cli/test/functional/test_site/expected/testPlantUML.html index c844b548ee..b1a5fc2a54 100644 --- a/packages/cli/test/functional/test_site/expected/testPlantUML.html +++ b/packages/cli/test/functional/test_site/expected/testPlantUML.html @@ -11,18 +11,18 @@ PlantUML Test - - - - - - - - - - + + + + + + + + + + - + @@ -233,7 +233,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testPopoverTrigger.html b/packages/cli/test/functional/test_site/expected/testPopoverTrigger.html index df9e726dcd..fd992ce519 100644 --- a/packages/cli/test/functional/test_site/expected/testPopoverTrigger.html +++ b/packages/cli/test/functional/test_site/expected/testPopoverTrigger.html @@ -11,18 +11,18 @@ Popover initiated by trigger should honor trigger attribute - - - - - - - - - - + + + + + + + + + + - + @@ -233,7 +233,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testPopovers.html b/packages/cli/test/functional/test_site/expected/testPopovers.html index b2318e2cf9..27087e9da6 100644 --- a/packages/cli/test/functional/test_site/expected/testPopovers.html +++ b/packages/cli/test/functional/test_site/expected/testPopovers.html @@ -11,18 +11,18 @@ Test: Popovers - - - - - - - - - - + + + + + + + + + + - + @@ -318,7 +318,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testThumbnails.html b/packages/cli/test/functional/test_site/expected/testThumbnails.html index 1fefbeceda..0f622deb7b 100644 --- a/packages/cli/test/functional/test_site/expected/testThumbnails.html +++ b/packages/cli/test/functional/test_site/expected/testThumbnails.html @@ -11,18 +11,18 @@ Thumbnails Test - - - - - - - - - - + + + + + + + + + + - + @@ -325,7 +325,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testTooltipSpacing.html b/packages/cli/test/functional/test_site/expected/testTooltipSpacing.html index 3031f9ec33..e12e771e01 100644 --- a/packages/cli/test/functional/test_site/expected/testTooltipSpacing.html +++ b/packages/cli/test/functional/test_site/expected/testTooltipSpacing.html @@ -11,18 +11,18 @@ Tooltip Spacing Test - - - - - - - - - - + + + + + + + + + + - + @@ -235,7 +235,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testTree.html b/packages/cli/test/functional/test_site/expected/testTree.html index dc195e4623..99c9948b3d 100644 --- a/packages/cli/test/functional/test_site/expected/testTree.html +++ b/packages/cli/test/functional/test_site/expected/testTree.html @@ -11,18 +11,18 @@ Tree tests - - - - - - - - - - + + + + + + + + + + - + @@ -300,7 +300,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/testVariableContainsInclude.html b/packages/cli/test/functional/test_site/expected/testVariableContainsInclude.html index f10ca21e1f..e42ab9f487 100644 --- a/packages/cli/test/functional/test_site/expected/testVariableContainsInclude.html +++ b/packages/cli/test/functional/test_site/expected/testVariableContainsInclude.html @@ -11,18 +11,18 @@ Variable should be able to store included content fragments - - - - - - - - - - + + + + + + + + + + - + @@ -225,7 +225,7 @@

+ diff --git a/packages/cli/test/functional/test_site/expected/test_md_fragment.html b/packages/cli/test/functional/test_site/expected/test_md_fragment.html index 9eadc56dfc..af5a3ca5b7 100644 --- a/packages/cli/test/functional/test_site/expected/test_md_fragment.html +++ b/packages/cli/test/functional/test_site/expected/test_md_fragment.html @@ -11,18 +11,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -226,7 +226,7 @@

+ diff --git a/packages/cli/test/functional/test_site_algolia_plugin/expected/index.html b/packages/cli/test/functional/test_site_algolia_plugin/expected/index.html index b1f5d2b71f..bd4b60e684 100644 --- a/packages/cli/test/functional/test_site_algolia_plugin/expected/index.html +++ b/packages/cli/test/functional/test_site_algolia_plugin/expected/index.html @@ -7,18 +7,18 @@ Hello World - - - - - - - - - - + + + + + + + + + + - + @@ -119,7 +119,7 @@

- + diff --git a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/Home.html b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/Home.html index 053ec31768..5149e3ff05 100644 --- a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/Home.html +++ b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/Home.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -73,7 +73,7 @@ - + diff --git a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/Page-1.html b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/Page-1.html index b9dee6439d..9c1ea2bb98 100644 --- a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/Page-1.html +++ b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/Page-1.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -73,7 +73,7 @@

Page 1 + diff --git a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/_Footer.html b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/_Footer.html index 6cd79c4f36..f3eb79fcef 100644 --- a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/_Footer.html +++ b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/_Footer.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -73,7 +73,7 @@ - + diff --git a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/_Sidebar.html b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/_Sidebar.html index a8778791d8..9f75fa04f8 100644 --- a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/_Sidebar.html +++ b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/_Sidebar.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -76,7 +76,7 @@ - + diff --git a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/about.html b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/about.html index 7cb7141143..44007f6e9b 100644 --- a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/about.html +++ b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/about.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -74,7 +74,7 @@

About + diff --git a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic1.html b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic1.html index f4f0fa14b2..8fcba9576d 100644 --- a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic1.html +++ b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic1.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -78,7 +78,7 @@

Topic 1 + diff --git a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic2.html b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic2.html index 5128d31ec9..c896ba9da1 100644 --- a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic2.html +++ b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic2.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -77,7 +77,7 @@ - + diff --git a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic3a.html b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic3a.html index 85033d19db..b43544b92b 100644 --- a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic3a.html +++ b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic3a.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -77,7 +77,7 @@ - + diff --git a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic3b.html b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic3b.html index 28c3dd39fe..67f59d78e7 100644 --- a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic3b.html +++ b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/contents/topic3b.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -77,7 +77,7 @@ - + diff --git a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/index.html b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/index.html index 4806f83143..f21031e134 100644 --- a/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/index.html +++ b/packages/cli/test/functional/test_site_convert/test_basic_convert/expected/index.html @@ -7,18 +7,18 @@ Landing Page - - - - - - - - - - + + + + + + + + + + - + @@ -73,7 +73,7 @@ - + diff --git a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/Home.html b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/Home.html index fdb27c5b18..497927e644 100644 --- a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/Home.html +++ b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/Home.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -107,7 +107,7 @@ - + diff --git a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/Page-1.html b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/Page-1.html index c589c41535..692b8dce95 100644 --- a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/Page-1.html +++ b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/Page-1.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -107,7 +107,7 @@

Page 1 + diff --git a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/README.html b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/README.html index 960a79fa8c..1652af46be 100644 --- a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/README.html +++ b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/README.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -108,7 +108,7 @@

Readme + diff --git a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/about.html b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/about.html index 39130705a7..6b5416c89d 100644 --- a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/about.html +++ b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/about.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -108,7 +108,7 @@

About + diff --git a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic1.html b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic1.html index ffdc516b07..6db000ab19 100644 --- a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic1.html +++ b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic1.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -111,7 +111,7 @@

Topic 1 + diff --git a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic2.html b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic2.html index f6ba83891f..e454002fe6 100644 --- a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic2.html +++ b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic2.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -110,7 +110,7 @@ - + diff --git a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic3a.html b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic3a.html index d2a3d451a6..dc5258f32e 100644 --- a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic3a.html +++ b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic3a.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -110,7 +110,7 @@ - + diff --git a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic3b.html b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic3b.html index 07037f9e3a..6b34c5e8cf 100644 --- a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic3b.html +++ b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/contents/topic3b.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -110,7 +110,7 @@ - + diff --git a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/index.html b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/index.html index 097dab2f40..2b54fdf256 100644 --- a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/index.html +++ b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/index.html @@ -7,18 +7,18 @@ Landing Page - - - - - - - - - - + + + + + + + + + + - + @@ -108,7 +108,7 @@

Readme + diff --git a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/test_folder/extra_1.html b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/test_folder/extra_1.html index 1f03e1d3d5..78975e6238 100644 --- a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/test_folder/extra_1.html +++ b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/test_folder/extra_1.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -107,7 +107,7 @@

+ diff --git a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/test_folder/extra_2.html b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/test_folder/extra_2.html index c2f3bf5466..5cb65214ea 100644 --- a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/test_folder/extra_2.html +++ b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/test_folder/extra_2.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -107,7 +107,7 @@

+ diff --git a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/test_folder/extra_3.html b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/test_folder/extra_3.html index de9fa4ac63..4c874d785f 100644 --- a/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/test_folder/extra_3.html +++ b/packages/cli/test/functional/test_site_convert/test_navigation_convert/expected/test_folder/extra_3.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -107,7 +107,7 @@

+ diff --git a/packages/cli/test/functional/test_site_special_tags/expected/index.html b/packages/cli/test/functional/test_site_special_tags/expected/index.html index 902856080a..49509a6485 100644 --- a/packages/cli/test/functional/test_site_special_tags/expected/index.html +++ b/packages/cli/test/functional/test_site_special_tags/expected/index.html @@ -7,18 +7,18 @@ Landing Page - - - - - - - - - - + + + + + + + + + + - + @@ -103,7 +103,7 @@

+ diff --git a/packages/cli/test/functional/test_site_templates/test_default/expected/contents/topic1.html b/packages/cli/test/functional/test_site_templates/test_default/expected/contents/topic1.html index 52ad2ad8bb..c392d6e538 100644 --- a/packages/cli/test/functional/test_site_templates/test_default/expected/contents/topic1.html +++ b/packages/cli/test/functional/test_site_templates/test_default/expected/contents/topic1.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -106,7 +106,7 @@

Topic 1 + diff --git a/packages/cli/test/functional/test_site_templates/test_default/expected/contents/topic2.html b/packages/cli/test/functional/test_site_templates/test_default/expected/contents/topic2.html index 2c135877d3..e330a0f29c 100644 --- a/packages/cli/test/functional/test_site_templates/test_default/expected/contents/topic2.html +++ b/packages/cli/test/functional/test_site_templates/test_default/expected/contents/topic2.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -105,7 +105,7 @@ - + diff --git a/packages/cli/test/functional/test_site_templates/test_default/expected/contents/topic3a.html b/packages/cli/test/functional/test_site_templates/test_default/expected/contents/topic3a.html index 03e2c2afd9..17c9ebfc2a 100644 --- a/packages/cli/test/functional/test_site_templates/test_default/expected/contents/topic3a.html +++ b/packages/cli/test/functional/test_site_templates/test_default/expected/contents/topic3a.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -105,7 +105,7 @@ - + diff --git a/packages/cli/test/functional/test_site_templates/test_default/expected/contents/topic3b.html b/packages/cli/test/functional/test_site_templates/test_default/expected/contents/topic3b.html index d0f804f69e..1394387120 100644 --- a/packages/cli/test/functional/test_site_templates/test_default/expected/contents/topic3b.html +++ b/packages/cli/test/functional/test_site_templates/test_default/expected/contents/topic3b.html @@ -7,18 +7,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -105,7 +105,7 @@ - + diff --git a/packages/cli/test/functional/test_site_templates/test_default/expected/index.html b/packages/cli/test/functional/test_site_templates/test_default/expected/index.html index e36939390d..b0d442d524 100644 --- a/packages/cli/test/functional/test_site_templates/test_default/expected/index.html +++ b/packages/cli/test/functional/test_site_templates/test_default/expected/index.html @@ -7,18 +7,18 @@ Landing Page - - - - - - - - - - + + + + + + + + + + - + @@ -254,7 +254,7 @@

Heading 3 - + diff --git a/packages/cli/test/functional/test_site_templates/test_minimal/expected/index.html b/packages/cli/test/functional/test_site_templates/test_minimal/expected/index.html index 8ec8e7d358..38fc08a032 100644 --- a/packages/cli/test/functional/test_site_templates/test_minimal/expected/index.html +++ b/packages/cli/test/functional/test_site_templates/test_minimal/expected/index.html @@ -7,18 +7,18 @@ Hello World - - - - - - - - - - + + + + + + + + + + - + @@ -39,7 +39,7 @@

- + diff --git a/packages/core/src/Page/index.js b/packages/core/src/Page/index.js index 0a46b6728e..7362e0c316 100644 --- a/packages/core/src/Page/index.js +++ b/packages/core/src/Page/index.js @@ -7,7 +7,6 @@ const { pageVueServerRenderer } = require('./PageVueServerRenderer'); const _ = {}; _.cloneDeep = require('lodash/cloneDeep'); -_.isString = require('lodash/isString'); _.isObject = require('lodash/isObject'); _.isArray = require('lodash/isArray'); @@ -15,7 +14,6 @@ const { CyclicReferenceError } = require('../errors'); const { PageSources } = require('./PageSources'); const { NodeProcessor } = require('../html/NodeProcessor'); -const fsUtil = require('../utils/fsUtil'); const logger = require('../utils/logger'); const PACKAGE_VERSION = require('../../package.json').version; @@ -141,13 +139,9 @@ class Page { if (this.siteConfig.titleSuffix) { title = (title ? title + TITLE_SUFFIX_SEPARATOR : '') + this.siteConfig.titleSuffix; } - // construct temporary asset object with only POSIX-style paths - const asset = {}; - Object.entries(this.asset).forEach(([key, value]) => { - asset[key] = _.isString(value) ? fsUtil.ensurePosix(value) : value; - }); + return { - asset, + asset: { ...this.asset }, baseUrl: this.siteConfig.baseUrl, content, pageUserScriptsAndStyles: this.pageUserScriptsAndStyles.join('\n'), diff --git a/packages/core/src/Site/index.js b/packages/core/src/Site/index.js index 01abe086ca..1bc6db552b 100644 --- a/packages/core/src/Site/index.js +++ b/packages/core/src/Site/index.js @@ -281,52 +281,38 @@ class Site { const sourcePath = path.join(this.rootPath, config.pageSrc); const resultPath = path.join(this.outputPath, fsUtil.setExtension(config.pageSrc, '.html')); + const baseAssetsPath = path.posix.join( + this.siteConfig.baseUrl || '/', TEMPLATE_SITE_ASSET_FOLDER_NAME, + ); + const pageConfig = new PageConfig({ asset: { - bootstrap: path.relative(path.dirname(resultPath), - path.join(this.siteAssetsDestPath, 'css', 'bootstrap.min.css')), + bootstrap: path.posix.join(baseAssetsPath, 'css', 'bootstrap.min.css'), externalScripts: _.union(this.siteConfig.externalScripts, config.externalScripts), - fontAwesome: path.relative(path.dirname(resultPath), - path.join(this.siteAssetsDestPath, 'fontawesome', 'css', 'all.min.css')), - glyphicons: path.relative(path.dirname(resultPath), - path.join(this.siteAssetsDestPath, 'glyphicons', 'css', - 'bootstrap-glyphicons.min.css')), - octicons: path.relative(path.dirname(resultPath), - path.join(this.siteAssetsDestPath, 'css', 'octicons.css')), - materialIcons: path.relative(path.dirname(resultPath), - path.join(this.siteAssetsDestPath, - 'material-icons', - 'material-icons.css')), - highlight: path.relative(path.dirname(resultPath), - path.join(this.siteAssetsDestPath, 'css', - HIGHLIGHT_ASSETS[this.siteConfig.style.codeTheme])), - markBindCss: path.relative(path.dirname(resultPath), - path.join(this.siteAssetsDestPath, 'css', 'markbind.min.css')), - markBindJs: path.relative(path.dirname(resultPath), - path.join(this.siteAssetsDestPath, 'js', 'markbind.min.js')), - pageNavCss: path.relative(path.dirname(resultPath), - path.join(this.siteAssetsDestPath, 'css', 'page-nav.css')), - siteNavCss: path.relative(path.dirname(resultPath), - path.join(this.siteAssetsDestPath, 'css', 'site-nav.css')), - bootstrapUtilityJs: path.relative(path.dirname(resultPath), - path.join(this.siteAssetsDestPath, 'js', - 'bootstrap-utility.min.js')), - polyfillJs: path.relative(path.dirname(resultPath), - path.join(this.siteAssetsDestPath, 'js', 'polyfill.min.js')), + fontAwesome: path.posix.join(baseAssetsPath, 'fontawesome', 'css', 'all.min.css'), + glyphicons: path.posix.join(baseAssetsPath, 'glyphicons', 'css', 'bootstrap-glyphicons.min.css'), + octicons: path.posix.join(baseAssetsPath, 'css', 'octicons.css'), + materialIcons: path.posix.join(baseAssetsPath, 'material-icons', 'material-icons.css'), + highlight: path.posix.join(baseAssetsPath, 'css', + HIGHLIGHT_ASSETS[this.siteConfig.style.codeTheme]), + markBindCss: path.posix.join(baseAssetsPath, 'css', 'markbind.min.css'), + markBindJs: path.posix.join(baseAssetsPath, 'js', 'markbind.min.js'), + pageNavCss: path.posix.join(baseAssetsPath, 'css', 'page-nav.css'), + siteNavCss: path.posix.join(baseAssetsPath, 'css', 'site-nav.css'), + bootstrapUtilityJs: path.posix.join(baseAssetsPath, 'js', 'bootstrap-utility.min.js'), + polyfillJs: path.posix.join(baseAssetsPath, 'js', 'polyfill.min.js'), // We use development Vue when MarkBind is served in 'dev' mode so that hydration issues are reported vue: this.dev ? 'https://cdn.jsdelivr.net/npm/vue@2.6.14/dist/vue.js' - : path.relative(path.dirname(resultPath), path.join(this.siteAssetsDestPath, 'js', 'vue.min.js')), - jQuery: path.relative(path.dirname(resultPath), - path.join(this.siteAssetsDestPath, 'js', 'jquery.min.js')), + : path.posix.join(baseAssetsPath, 'js', 'vue.min.js'), + jQuery: path.posix.join(baseAssetsPath, 'js', 'jquery.min.js'), }, baseUrlMap: this.baseUrlMap, dev: this.dev, faviconUrl: config.faviconUrl, frontmatterOverride: config.frontmatter, layout: config.layout, - layoutsAssetPath: path.relative(path.dirname(resultPath), - path.join(this.siteAssetsDestPath, LAYOUT_SITE_FOLDER_NAME)), + layoutsAssetPath: path.posix.join(baseAssetsPath, LAYOUT_SITE_FOLDER_NAME), pluginManager: this.pluginManager, resultPath, rootPath: this.rootPath,