fix: match production URL format and fix OG URL
- Use front-matter title for post slug (not filename) - Remove /posts/ prefix from URLs to match production - Remove /pages/ prefix from page URLs to match production - Fix OG URL on index page (no longer shows .html extension) - Remove dots from slugs (fixes T.I.L. posts being files not dirs) - Collapse consecutive dashes in slugs - Remove / from slug character class (prevents URL paths in slugs) - Skip index.html in permalink plugin (already has correct path from pagination) Production URL format: /YYYY-MM-DD-full-title-slug/
This commit is contained in:
1 parent
b21390b1a4
commit
63a171aefd
2 files changed
+13
-25
No files matched your search
@@ -377,7 +377,7 @@ const ms = Metalsmith(__dirname)
|
|||||||
.use(function (files, metalsmith, done) {
|
.use(function (files, metalsmith, done) {
|
||||||
// Pre-compute paths for layouts rendering
|
// Pre-compute paths for layouts rendering
|
||||||
// This mirrors the permalinks logic but doesn't rename files
|
// This mirrors the permalinks logic but doesn't rename files
|
||||||
const slugRe = /[<>:"'\|?*]|[^\w\s$_+~.()!\-@\/]+/g;
|
const slugRe = /[<>:"'\|?*]|[^\w\s$_+~.()!\-@]+/g;
|
||||||
const linksets = [
|
const linksets = [
|
||||||
{ match: { collection: "pages" }, pattern: ":title" },
|
{ match: { collection: "pages" }, pattern: ":title" },
|
||||||
{ match: { collection: "drafts" }, pattern: "drafts/:title" },
|
{ match: { collection: "drafts" }, pattern: "drafts/:title" },
|
||||||
@@ -396,6 +396,12 @@ const ms = Metalsmith(__dirname)
|
|||||||
|
|
||||||
// Skip layout files (layout matches filename)
|
// Skip layout files (layout matches filename)
|
||||||
const baseName = path.basename(file, ".html");
|
const baseName = path.basename(file, ".html");
|
||||||
|
// Don't skip index.html - it already has permalink from pagination
|
||||||
|
if (file === "index.html") {
|
||||||
|
// Set path for index page (root URL)
|
||||||
|
data.path = "";
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if (data.layout === baseName || data.layout === `${baseName}.html`) continue;
|
if (data.layout === baseName || data.layout === `${baseName}.html`) continue;
|
||||||
|
|
||||||
// Determine linkset
|
// Determine linkset
|
||||||
@@ -426,14 +432,11 @@ const ms = Metalsmith(__dirname)
|
|||||||
const d = data._filenameDate;
|
const d = data._filenameDate;
|
||||||
return d.getFullYear() + "-" + String(d.getMonth() + 1).padStart(2, "0") + "-" + String(d.getDate()).padStart(2, "0");
|
return d.getFullYear() + "-" + String(d.getMonth() + 1).padStart(2, "0") + "-" + String(d.getDate()).padStart(2, "0");
|
||||||
}
|
}
|
||||||
if (key === "title" && data._filenameTitle) {
|
|
||||||
return data._filenameTitle.replace(/\s+/g, "-").replace(slugRe, "");
|
|
||||||
}
|
|
||||||
if (value instanceof Date) {
|
if (value instanceof Date) {
|
||||||
const d = value;
|
const d = value;
|
||||||
return d.getFullYear() + "-" + String(d.getMonth() + 1).padStart(2, "0") + "-" + String(d.getDate()).padStart(2, "0");
|
return d.getFullYear() + "-" + String(d.getMonth() + 1).padStart(2, "0") + "-" + String(d.getDate()).padStart(2, "0");
|
||||||
}
|
}
|
||||||
return String(value).toLowerCase().replace(/\s+/g, "-").replace(slugRe, "");
|
return String(value).toLowerCase().replace(/\s+/g, "-").replace(slugRe, "").replace(/-+/g, "-").replace(/\./g, "");
|
||||||
})
|
})
|
||||||
.replace(/\/+$/, "");
|
.replace(/\/+$/, "");
|
||||||
|
|
||||||
@@ -444,12 +447,8 @@ const ms = Metalsmith(__dirname)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepend source directory prefix
|
// Post files: no prefix - URLs match production format /YYYY-MM-DD-slug/
|
||||||
let sourcePrefix = "";
|
data.permalink = result;
|
||||||
if (file.startsWith("posts/")) sourcePrefix = "posts/";
|
|
||||||
else if (file.startsWith("pages/")) sourcePrefix = "pages/";
|
|
||||||
|
|
||||||
data.permalink = sourcePrefix + result;
|
|
||||||
|
|
||||||
// Set path for templates (permalink without index.html)
|
// Set path for templates (permalink without index.html)
|
||||||
if (data.permalink.endsWith("/index.html")) {
|
if (data.permalink.endsWith("/index.html")) {
|
||||||
|
|||||||
+3
-14
@@ -69,14 +69,10 @@ function permalinks(options) {
|
|||||||
if (key === 'date' && data._filenameDate) {
|
if (key === 'date' && data._filenameDate) {
|
||||||
return formatDate(data._filenameDate);
|
return formatDate(data._filenameDate);
|
||||||
}
|
}
|
||||||
// For title in permalink, use _filenameTitle if available (to match source filenames)
|
|
||||||
if (key === 'title' && data._filenameTitle) {
|
|
||||||
return slugify(data._filenameTitle);
|
|
||||||
}
|
|
||||||
if (value instanceof Date) {
|
if (value instanceof Date) {
|
||||||
return formatDate(value);
|
return formatDate(value);
|
||||||
}
|
}
|
||||||
return slugify(value.toString());
|
return slugify(value.toString()).replace(/-+/, "-");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -131,14 +127,8 @@ function permalinks(options) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// For posts: preserve the "posts/" prefix
|
|
||||||
// For other files: use the pattern as-is
|
|
||||||
let sourcePrefix = "";
|
let sourcePrefix = "";
|
||||||
if (file.startsWith("posts/")) {
|
|
||||||
sourcePrefix = "posts/";
|
|
||||||
} else if (file.startsWith("pages/")) {
|
|
||||||
sourcePrefix = "pages/";
|
|
||||||
}
|
|
||||||
|
|
||||||
// Replace pattern placeholders
|
// Replace pattern placeholders
|
||||||
let result = replacePattern(pattern, data);
|
let result = replacePattern(pattern, data);
|
||||||
@@ -155,8 +145,7 @@ function permalinks(options) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepend source directory prefix
|
data.permalink = result;
|
||||||
data.permalink = sourcePrefix + result;
|
|
||||||
|
|
||||||
// Set path metadata for templates (permalink without index.html)
|
// Set path metadata for templates (permalink without index.html)
|
||||||
if (data.permalink.endsWith("/index.html")) {
|
if (data.permalink.endsWith("/index.html")) {
|
||||||
|
|||||||
Reference in new issue
Block a user