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

changed page url generation #95

Merged
merged 2 commits into from
May 11, 2021
Merged

changed page url generation #95

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
332edc0
changed page url generation
oscarotero May 11, 2021
0f37015
use url object to configure url conversion
oscarotero May 11, 2021
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
49 changes: 30 additions & 19 deletions site.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,19 +486,40 @@ export default class Site {
#urlPage(page) {
const { dest } = page;
let url = page.data.url;
let transform = true;

if (typeof url === "function") {
url = url(page);
}

let { prettyUrls, slugifyUrls } = this.options;

if (typeof url === "object") {
dest.path = url.path || dest.path;
dest.ext = url.ext || "";
transform = false;
} else if (typeof url === "string") {
dest.ext = extname(url);
dest.path = dest.ext ? url.slice(0, -dest.ext.length) : url;
if (url.hasOwnProperty("pretty")) {
prettyUrls = url.pretty;
}

if (url.hasOwnProperty("slugify")) {
slugifyUrls = url.slugify;
}

if (url.hasOwnProperty("path")) {
url = url.path;
}
}

if (typeof url === "string") {
if (url.endsWith("/")) {
dest.path = posix.join(url, "index");
dest.ext = ".html";
} else {
dest.ext = extname(url);
dest.path = dest.ext ? url.slice(0, -dest.ext.length) : url;
}
} else if (!dest.ext) {
if (prettyUrls && posix.basename(dest.path) !== "index") {
dest.path = posix.join(dest.path, "index");
}
dest.ext = ".html";
}

// Relative URL
Expand All @@ -508,18 +529,8 @@ export default class Site {
dest.path = `/${dest.path}`;
}

// Transform (prettyUrls, slugifyUrls)
if (transform) {
if (this.options.slugifyUrls) {
dest.path = slugify(dest.path, this.options.slugifyUrls);
}

if (!dest.ext) {
if (this.options.prettyUrls && posix.basename(dest.path) !== "index") {
dest.path = posix.join(dest.path, "index");
}
dest.ext = ".html";
}
if (slugifyUrls) {
dest.path = slugify(dest.path, slugifyUrls);
}

page.data.url =
Expand Down