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

fix: use v1.1 schema only when parsing (#3569)

Browse Source
This commit is contained in:
Erez Rokah
2020-04-09 14:17:12 +03:00
committed by GitHub
parent bfb2e2bc57
commit 0761ffa3f2
83 changed files with 137 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/netlify-cms-core/src/formats/__tests__/yaml.spec.js
View File

@ -7,12 +7,12 @@ describe('yaml', () => {
expect(yaml.fromFile('[]')).toEqual([]);
const result = yaml.fromFile(stripIndent`
date: '2020-04-02T16:08:03.327Z'
date: 2020-04-02T16:08:03.327Z
boolean: true
number: 1
`);
expect(result).toEqual({
date: '2020-04-02T16:08:03.327Z',
date: new Date('2020-04-02T16:08:03.327Z'),
boolean: true,
number: 1,
});
@ -29,7 +29,7 @@ describe('yaml', () => {
# image comment
image: /media/netlify.png
# date comment
date: '2020-04-02T13:27:48.617Z'
date: 2020-04-02T13:27:48.617Z
# object comment
object:
# object_title comment
@ -48,7 +48,7 @@ describe('yaml', () => {
object_title: 'object_title',
object_list: [{ object_list_item_1: '1', object_list_item_2: '2' }],
},
date: '2020-04-02T13:27:48.617Z',
date: new Date('2020-04-02T13:27:48.617Z'),
image: '/media/netlify.png',
title: 'title',
template: 'post',
@ -85,7 +85,7 @@ title: title
# image comment
image: /media/netlify.png
# date comment
date: "2020-04-02T13:27:48.617Z"
date: 2020-04-02T13:27:48.617Z
# object comment
object:
# object_title comment
@ -106,7 +106,7 @@ list:
object_title: 'object_title',
object_list: [{ object_list_item_1: '1', object_list_item_2: '2' }],
},
date: '2020-04-02T13:27:48.617Z',
date: new Date('2020-04-02T13:27:48.617Z'),
image: '/media/netlify.png',
title: 'title',
template: 'post',

6
packages/netlify-cms-core/src/formats/yaml.js
View File

@ -17,14 +17,12 @@ const addComments = (items, comments, prefix = '') => {
});
};
const options = { version: '1.1' };
export default {
fromFile(content) {
if (content && content.trim().endsWith('---')) {
content = content.trim().slice(0, -3);
}
return yaml.parse(content, options);
return yaml.parse(content, { version: '1.1' });
},
toFile(data, sortedKeys = [], comments = {}) {
@ -33,7 +31,7 @@ export default {
addComments(contents.items, comments);
contents.items.sort(sortKeys(sortedKeys, item => item.key?.toString()));
const doc = new yaml.Document(options);
const doc = new yaml.Document();
doc.contents = contents;
return doc.toString();