Skip to content

fix: use slugify for path formatting and keeping diacritics #187

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.

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

Merged
merged 1 commit into from
Apr 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
"netlify-cms-ui-default": "^2.12.2",
"react": "^16.8.4",
"react-dom": "^16.8.4",
"react-select": "^3.1.0"
"react-select": "^3.1.0",
"slugify": "^1.5.0"
},
"devDependencies": {
"@babel/core": "^7.11.6",
Expand Down
3 changes: 2 additions & 1 deletion src/ParentWidget.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import AsyncSelect from 'react-select/async';
import { reactSelectStyles } from 'netlify-cms-ui-default/dist/esm/styles';
import { NestedCollection } from './NestedCollection';
import slugify from 'slugify';

const trimStart = (str, prefix) => {
return str.substring(prefix.length);
Expand Down Expand Up @@ -44,7 +45,7 @@ const Option = (props) => {

export const sanitizePath = (path) => {
const replacement = '-';
const sanitizedPath = path.replace(/[^a-z0-9]/gi, replacement).toLowerCase();
const sanitizedPath = slugify(path.toLowerCase(), replacement);

// Remove any doubled or leading/trailing replacement characters (that were added in the sanitizers).
const doubleReplacement = new RegExp(`(?:${replacement})+`, 'g');
Expand Down
8 changes: 8 additions & 0 deletions src/ParentWidget.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,12 @@ describe('sanitizePath', () => {
it('should remove double replacer', () => {
expect(sanitizePath('Who Are We')).toBe('who-are-we');
});

it('should keep diacritis', () => {
expect(sanitizePath('ăștia sunteți voi')).toBe('astia-sunteti-voi');
});

it('should keep diacritis and remove whitespace, trailing and leading characters', () => {
expect(sanitizePath('?ăștia sunteți voi ? ')).toBe('astia-sunteti-voi');
});
});
5 changes: 5 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7060,6 +7060,11 @@ slice-ansi@^4.0.0:
astral-regex "^2.0.0"
is-fullwidth-code-point "^3.0.0"

slugify@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.5.0.tgz#5f3c8e2a84105b54eb51486db1b468a599b3c9b8"
integrity sha512-Q2UPZ2udzquy1ElHfOLILMBMqBEXkiD3wE75qtBvV+FsDdZZjUqPZ44vqLTejAVq+wLLHacOMcENnP8+ZbzmIA==

snapdragon-node@^2.0.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
Expand Down