decap-cms-core 3.11.0 → 3.12.0

package/src/backend.ts

@@ -1178,6 +1178,7 @@ export class Backend {
         path,
         authorLogin: user.login,
         authorName: user.name,
+        authorEmail: user.email,
       },
       user.useOpenAuthoring,
     );
@@ -1253,6 +1254,7 @@ export class Backend {
           path: file.path,
           authorLogin: user.login,
           authorName: user.name,
+          authorEmail: user.email,
         },
         user.useOpenAuthoring,
       ),
@@ -1279,6 +1281,7 @@ export class Backend {
         path,
         authorLogin: user.login,
         authorName: user.name,
+        authorEmail: user.email,
       },
       user.useOpenAuthoring,
     );
@@ -1303,6 +1306,7 @@ export class Backend {
         path,
         authorLogin: user.login,
         authorName: user.name,
+        authorEmail: user.email,
       },
       user.useOpenAuthoring,
     );

package/src/components/Editor/EditorPreviewPane/EditorPreviewContent.js

@@ -67,6 +67,7 @@ class PreviewContent extends React.Component {
 
 PreviewContent.propTypes = {
   previewComponent: PropTypes.func.isRequired,
+  getEditorComponents: PropTypes.func,
   previewProps: PropTypes.object,
   onFieldClick: PropTypes.func,
 };

package/src/components/Editor/EditorPreviewPane/EditorPreviewPane.js

@@ -13,6 +13,7 @@ import {
   getPreviewTemplate,
   getPreviewStyles,
   getRemarkPlugins,
+  getEditorComponents,
 } from '../../../lib/registry';
 import { getAllEntries, tryLoadEntry } from '../../../actions/entries';
 import { ErrorBoundary } from '../../UI';
@@ -57,6 +58,7 @@ export class PreviewPane extends React.Component {
         fieldsMetaData={metadata}
         resolveWidget={resolveWidget}
         getRemarkPlugins={getRemarkPlugins}
+        getEditorComponents={getEditorComponents}
       />
     );
   };
@@ -261,6 +263,7 @@ export class PreviewPane extends React.Component {
         this.widgetFor(name, fields, values, fieldsMetaData),
       widgetsFor: this.widgetsFor,
       getCollection: this.getCollection,
+      getEditorComponents,
     };
 
     const styleEls = getPreviewStyles().map((style, i) => {

package/src/components/MediaLibrary/MediaLibraryButtons.js

@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { css } from '@emotion/react';
 import styled from '@emotion/styled';
-import copyToClipboard from 'copy-text-to-clipboard';
 import { isAbsolutePath } from 'decap-cms-lib-util';
 import { buttons, shadows, zIndex } from 'decap-cms-ui-default';
 
@@ -87,10 +86,10 @@ export class CopyToClipBoardButton extends React.Component {
     this.mounted = false;
   }
 
-  handleCopy = () => {
+  handleCopy = async () => {
     clearTimeout(this.timeout);
     const { path, draft, name } = this.props;
-    copyToClipboard(isAbsolutePath(path) || !draft ? path : name);
+    await navigator.clipboard.writeText(isAbsolutePath(path) || !draft ? path : name);
     this.setState({ copied: true });
     this.timeout = setTimeout(() => this.mounted && this.setState({ copied: false }), 1500);
   };

package/src/components/UI/ErrorBoundary.js

@@ -4,7 +4,6 @@ import { translate } from 'react-polyglot';
 import styled from '@emotion/styled';
 import yaml from 'yaml';
 import truncate from 'lodash/truncate';
-import copyToClipboard from 'copy-text-to-clipboard';
 import { localForage } from 'decap-cms-lib-util';
 import { buttons, colors } from 'decap-cms-ui-default';
 
@@ -117,7 +116,7 @@ function RecoveredEntry({ entry, t }) {
       <hr />
       <h2>{t('ui.errorBoundary.recoveredEntry.heading')}</h2>
       <strong>{t('ui.errorBoundary.recoveredEntry.warning')}</strong>
-      <CopyButton onClick={() => copyToClipboard(entry)}>
+      <CopyButton onClick={() => navigator.clipboard.writeText(entry)}>
         {t('ui.errorBoundary.recoveredEntry.copyButtonLabel')}
       </CopyButton>
       <pre>

package/src/formats/__tests__/frontmatter.spec.js

@@ -72,6 +72,27 @@ describe('Frontmatter', () => {
       });
     });
 
+    it('should throw on duplicate frontmatter keys', () => {
+      expect(() =>
+        FrontmatterInfer.fromFile('---\ntitle: Hello\ntitle: World\n---\nContent'),
+      ).toThrow(/Map keys must be unique/);
+    });
+
+    it('should throw on duplicate frontmatter keys with explicit YAML format', () => {
+      expect(() =>
+        frontmatterYAML().fromFile('---\ntitle: Hello\ntitle: World\n---\nContent'),
+      ).toThrow(/Map keys must be unique/);
+    });
+
+    it('should not throw when body contains YAML-like patterns', () => {
+      expect(
+        FrontmatterInfer.fromFile('---\ntitle: Hello\n---\ntitle: this is not a duplicate'),
+      ).toEqual({
+        title: 'Hello',
+        body: 'title: this is not a duplicate',
+      });
+    });
+
     it('should stringify YAML with --- delimiters', () => {
       expect(
         FrontmatterInfer.toFile({

package/src/formats/__tests__/yaml.spec.js

@@ -85,6 +85,33 @@ describe('yaml', () => {
         time: '10:05',
       });
     });
+
+    test('throws on duplicate keys', () => {
+      expect(() => yaml.fromFile('title: Hello\ntitle: World')).toThrow(
+        /Map keys must be unique; "title" is repeated/,
+      );
+    });
+
+    test('throws on duplicate nested keys', () => {
+      expect(() => yaml.fromFile('nested:\n  a: 1\n  a: 2')).toThrow(
+        /Map keys must be unique; "a" is repeated/,
+      );
+    });
+
+    test('does not throw when same key appears in different nested objects', () => {
+      expect(yaml.fromFile('obj1:\n  name: foo\nobj2:\n  name: bar')).toEqual({
+        obj1: { name: 'foo' },
+        obj2: { name: 'bar' },
+      });
+    });
+
+    test('logs warnings to console.warn', () => {
+      const warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
+      // Valid YAML should produce no warnings
+      yaml.fromFile('title: Hello');
+      expect(warnSpy).not.toHaveBeenCalled();
+      warnSpy.mockRestore();
+    });
   });
   describe('toFile', () => {
     test('outputs valid yaml', () => {

package/src/formats/yaml.ts

@@ -41,7 +41,22 @@ export default {
     if (content && content.trim().endsWith('---')) {
       content = content.trim().slice(0, -3);
     }
-    return yaml.parse(content, { customTags: [timestampTag] });
+
+    const doc = yaml.parseDocument(content, {
+      customTags: [timestampTag],
+      prettyErrors: true,
+    });
+
+    for (const warn of doc.warnings) {
+      console.warn(`YAML warning: ${warn.message}`);
+    }
+
+    if (doc.errors.length > 0) {
+      const messages = doc.errors.map(e => e.message).join('\n');
+      throw new Error(`YAML parsing error:\n${messages}`);
+    }
+
+    return doc.toJSON();
   },
 
   toFile(data: object, sortedKeys: string[] = [], comments: Record<string, string> = {}) {

package/src/lib/__tests__/formatters.spec.js

@@ -247,6 +247,27 @@ describe('formatters', () => {
         'Ignoring unknown variable “author-email” in open authoring message template.',
       );
     });
+
+    it('should return commit with trailer when signoff_commits is enabled', () => {
+      const collection = Map({ label_singular: 'Collection' });
+      const config = {
+        backend: {
+          signoff_commits: true,
+        },
+      };
+
+      expect(
+        commitMessageFormatter('create', config, {
+          slug: 'doc-slug',
+          path: 'file-path',
+          collection,
+          authorName: 'Test User',
+          authorEmail: 'test-user@example.org',
+        }),
+      ).toEqual(
+        'Create Collection “doc-slug”\n\nSigned-off-by: Test User <test-user@example.org>\n',
+      );
+    });
   });
 
   describe('prepareSlug', () => {

package/src/lib/formatters.ts

@@ -44,16 +44,28 @@ type Options = {
   collection?: Collection;
   authorLogin?: string;
   authorName?: string;
+  authorEmail?: string;
 };
 
 export function commitMessageFormatter(
   type: keyof typeof commitMessageTemplates,
   config: CmsConfig,
-  { slug, path, collection, authorLogin, authorName }: Options,
+  { slug, path, collection, authorLogin, authorName, authorEmail }: Options,
   isOpenAuthoring?: boolean,
 ) {
   const templates = { ...commitMessageTemplates, ...(config.backend.commit_messages || {}) };
 
+  let trailers = '';
+  if (config.backend.signoff_commits) {
+    if (!authorName) {
+      console.warn('Option signoff_commits is enabled, but author name is unknown');
+    } else if (!authorEmail) {
+      console.warn('Option signoff_commits is enabled, but author email is unknown');
+    } else {
+      trailers = `\n\nSigned-off-by: ${authorName} <${authorEmail}>\n`;
+    }
+  }
+
   const commitMessage = templates[type].replace(variableRegex, (_, variable) => {
     switch (variable) {
       case 'slug':
@@ -73,7 +85,7 @@ export function commitMessageFormatter(
   });
 
   if (!isOpenAuthoring) {
-    return commitMessage;
+    return commitMessage + trailers;
   }
 
   const message = templates.openAuthoring.replace(variableRegex, (_, variable) => {
@@ -90,7 +102,7 @@ export function commitMessageFormatter(
     }
   });
 
-  return message;
+  return message + trailers;
 }
 
 export function prepareSlug(slug: string) {

package/src/lib/i18n.ts

@@ -308,18 +308,26 @@ export async function getI18nEntry(
   if (structure === I18N_STRUCTURE.SINGLE_FILE) {
     entryValue = mergeSingleFileValue(await getEntryValue(path), defaultLocale, locales);
   } else {
-    const entryValues = await Promise.all(
+    const entryValuesResults = await Promise.allSettled(
       locales.map(async locale => {
         const entryPath = getFilePath(structure, extension, path, slug, locale);
-        const value = await getEntryValue(entryPath).catch(() => null);
+        const value = await getEntryValue(entryPath);
         return { value, locale };
       }),
     );
 
-    const nonNullValues = entryValues.filter(e => e.value !== null) as {
-      value: EntryValue;
-      locale: string;
-    }[];
+    const nonNullValues = entryValuesResults
+      .map(e => (e.status === 'fulfilled' ? e.value : undefined))
+      .filter((e): e is { value: EntryValue; locale: string } => e !== undefined);
+
+    if (nonNullValues.length === 0) {
+      // mergeValues will throw on an empty list, and show the error messages.
+      const [error = new Error('No entry values found for any locale')] = entryValuesResults
+        .map(e => (e.status === 'rejected' ? e.reason : undefined))
+        .filter(e => e !== undefined);
+
+      throw error;
+    }
 
     entryValue = mergeValues(collection, structure, defaultLocale, nonNullValues);
   }

package/src/types/redux.ts

@@ -377,6 +377,7 @@ export interface CmsBackend {
   auth_endpoint?: string;
   cms_label_prefix?: string;
   squash_merges?: boolean;
+  signoff_commits?: boolean;
   proxy_url?: string;
   commit_messages?: {
     create?: string;