gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-implement standard slugification with IRIs instead of URIs.

Browse Source
This commit is contained in:
Caleb 2017-09-30 17:27:07 -06:00
parent 8a2b4fc843
commit 9bc65cd0ac
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backends/backend.js
View File

@ -5,7 +5,8 @@ import GitGatewayBackend from "./git-gateway/implementation";
import { resolveFormat } from "../formats/formats"; import { resolveFormat } from "../formats/formats";
import { selectListMethod, selectEntrySlug, selectEntryPath, selectAllowNewEntries, selectFolderEntryExtension } from "../reducers/collections"; import { selectListMethod, selectEntrySlug, selectEntryPath, selectAllowNewEntries, selectFolderEntryExtension } from "../reducers/collections";
import { createEntry } from "../valueObjects/Entry"; import { createEntry } from "../valueObjects/Entry";
import sanitize from 'sanitize-filename'; import { sanitizeIRI } from "../lib/urlHelper";
import sanitizeFilename from 'sanitize-filename';
class LocalStorageAuthStore { class LocalStorageAuthStore {
storageKey = "netlify-cms-user"; storageKey = "netlify-cms-user";
@ -57,7 +58,19 @@ const slugFormatter = (template = "{{slug}}", entryData) => {
} }
}); });
return sanitize(slug, {replacement: "-"}).replace(/[.]/g, '-'); // Convert slug to lower-case;
slug = slug.toLocaleLowerCase();
// Replace periods and spaces with dashes.
slug = slug.replace(/[.\s]/g, '-');
// Sanitize as IRI (i18n URI) and as filename.
slug = sanitizeIRI(slug, {replacement: "-"});
slug = sanitizeFilename(slug, {replacement: "-"});
// Remove any doubled or trailing replacement characters (that were added in the sanitizers).
slug = slug.replace(/-+/g, '-').replace(/-$/, '');
return slug;
}; };
class Backend { class Backend {

16
src/lib/urlHelper.js
View File

@ -12,6 +12,22 @@ export function getNewEntryUrl(collectionName, direct) {
return getUrl(`/collections/${ collectionName }/entries/new`, direct); return getUrl(`/collections/${ collectionName }/entries/new`, direct);
} }
// Unreserved chars from RFC3987.
const uriChars = /[\w\-.~]/i;
const ucsChars = /[\xA0-\u{D7FF}]|[\u{F900}-\u{FDCF}]|[\u{FDF0}-\u{FFEF}]|[\u{10000}-\u{1FFFD}]|[\u{20000}-\u{2FFFD}]|[\u{30000}-\u{3FFFD}]|[\u{40000}-\u{4FFFD}]|[\u{50000}-\u{5FFFD}]|[\u{60000}-\u{6FFFD}]|[\u{70000}-\u{7FFFD}]|[\u{80000}-\u{8FFFD}]|[\u{90000}-\u{9FFFD}]|[\u{A0000}-\u{AFFFD}]|[\u{B0000}-\u{BFFFD}]|[\u{C0000}-\u{CFFFD}]|[\u{D0000}-\u{DFFFD}]|[\u{E1000}-\u{EFFFD}]/u;
export function sanitizeIRI(str, { replacement }) {
let result = "";
// We cannot use a `map` function here because `string.split()` splits things like emojis into surrogate pairs.
for (const char of str) {
if (uriChars.test(char) || ucsChars.test(char)) {
result += char;
} else {
result += replacement;
}
}
return result;
}
export function urlize(string) { export function urlize(string) {
const sanitized = makePathSanitized(string); const sanitized = makePathSanitized(string);
const parsedURL = url.parse(sanitized); const parsedURL = url.parse(sanitized);