Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add trailing slash to sitemap URLs to avoid unnecessary redirects #105

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Add trailing slash to sitemap URLs to avoid unnecessary redirects #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
79a7d01
Add trailing slash to sitemap URLs to avoid unnecessary redirects.
mwermeester Dec 22, 2020
fafe7ba
Merge branch 'master' into add-trailing-slash-to-sitemap-urls
mwermeester May 4, 2021
29e144c
Add back accidentally deleted locations.
mwermeester May 11, 2021
ff888dc
Merge branch 'JohnSundell:master' into add-trailing-slash-to-sitemap-…
mwermeester May 11, 2021
bd4cffa
Merge branch 'JohnSundell:master' into add-trailing-slash-to-sitemap-…
mwermeester Jul 3, 2021
5200019
Merge branch 'JohnSundell:master' into add-trailing-slash-to-sitemap-…
mwermeester Aug 27, 2022
fdcce6a
Update packages.
mwermeester Apr 9, 2023
82e7c74
Merge branch 'master' into add-trailing-slash-to-sitemap-urls
mwermeester Apr 11, 2023
f48eb1c
Merge branch 'JohnSundell:master' into master
mwermeester Apr 22, 2023
fbfb25a
Merge branch 'JohnSundell:master' into add-trailing-slash-to-sitemap-…
mwermeester Apr 22, 2023
c83950d
Merge branch 'master' into add-trailing-slash-to-sitemap-urls
mwermeester Apr 22, 2023
9079d39
Merge from upstream.
mwermeester Apr 22, 2023
6cdad37
Fix Plot package version.
mwermeester Apr 22, 2023
dcd15af
Fix Plot package version.
mwermeester Apr 22, 2023
8fe6b2f
Fix resolved Plot package version.
mwermeester Apr 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"repositoryURL": "https://github.com/johnsundell/collectionConcurrencyKit.git",
"state": {
"branch": null,
"revision": "2e4984dcaed6432f4eff175f6616ba463428cd8a",
"version": "0.1.0"
"revision": "b4f23e24b5a1bff301efc5e70871083ca029ff95",
"version": "0.2.0"
}
},
{
Expand All @@ -33,15 +33,15 @@
"repositoryURL": "https://github.com/johnsundell/ink.git",
"state": {
"branch": null,
"revision": "77c3d8953374a9cf5418ef0bd7108524999de85a",
"version": "0.5.1"
"revision": "bcc9f219900a62c4210e6db726035d7f03ae757b",
"version": "0.6.0"
}
},
{
"package": "Plot",
"repositoryURL": "https://github.com/johnsundell/plot.git",
"state": {
"branch": null,
"branch": "0.9.0",
"revision": "80612b34252188edbef280e5375e2fc5249ac770",
"version": "0.9.0"
}
Expand Down
6 changes: 3 additions & 3 deletions Sources/Publish/Internal/SiteMapGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ private extension SiteMapGenerator {

return .group(
.url(
.loc(site.url(for: section)),
.loc(site.url(for: section).appendingPathComponent("/")),
.changefreq(.daily),
.priority(1.0),
.lastmod(max(
Expand All @@ -57,7 +57,7 @@ private extension SiteMapGenerator {
}

return .url(
.loc(site.url(for: item)),
.loc(site.url(for: item).appendingPathComponent("/")),
.changefreq(.monthly),
.priority(0.5),
.lastmod(item.lastModified)
Expand All @@ -71,7 +71,7 @@ private extension SiteMapGenerator {
}

return .url(
.loc(site.url(for: page)),
.loc(site.url(for: page).appendingPathComponent("/")),
.changefreq(.monthly),
.priority(0.5),
.lastmod(page.lastModified)
Expand Down
26 changes: 13 additions & 13 deletions Tests/PublishTests/Tests/SiteMapGenerationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ final class SiteMapGenerationTests: PublishTestCase {
let siteMap = try file.readAsString()

let expectedLocations = [
"https://swiftbysundell.com/one",
"https://swiftbysundell.com/one/item",
"https://swiftbysundell.com/page"
"https://swiftbysundell.com/one/",
"https://swiftbysundell.com/one/item/",
"https://swiftbysundell.com/page/"
]

for location in expectedLocations {
Expand Down Expand Up @@ -56,19 +56,19 @@ final class SiteMapGenerationTests: PublishTestCase {
let siteMap = try file.readAsString()

let expectedLocations = [
"https://swiftbysundell.com/one",
"https://swiftbysundell.com/one/itemA",
"https://swiftbysundell.com/three/itemE",
"https://swiftbysundell.com/pageA"
"https://swiftbysundell.com/one/",
"https://swiftbysundell.com/one/itemA/",
"https://swiftbysundell.com/three/itemE/",
"https://swiftbysundell.com/pageA/"
]

let unexpectedLocations = [
"https://swiftbysundell.com/one/itemB",
"https://swiftbysundell.com/two",
"https://swiftbysundell.com/two/itemC",
"https://swiftbysundell.com/two/itemD",
"https://swiftbysundell.com/three/posts/itemF",
"https://swiftbysundell.com/pageB"
"https://swiftbysundell.com/one/itemB/",
"https://swiftbysundell.com/two/",
"https://swiftbysundell.com/two/itemC/",
"https://swiftbysundell.com/two/itemD/",
"https://swiftbysundell.com/three/posts/itemF/",
"https://swiftbysundell.com/pageB/"
]

for location in expectedLocations {
Expand Down