decap-cms-core 3.14.0 → 3.15.0

package/dist/esm/constants/configSchema.js

@@ -1,7 +1,6 @@
 import AJV from 'ajv';
 import { select, uniqueItemProperties, instanceof as instanceOf, prohibited } from 'ajv-keywords/dist/keywords';
 import ajvErrors from 'ajv-errors';
-import { v4 as uuid } from 'uuid';
 import { frontmatterFormats, extensionFormatters } from '../formats/formats';
 import { getWidgets } from '../lib/registry';
 import { I18N_STRUCTURE, I18N_FIELD } from '../lib/i18n';
@@ -49,7 +48,7 @@ const i18nField = {
  * Config for fields in both file and folder collections.
  */
 function fieldsConfig() {
-  const id = uuid();
+  const id = crypto.randomUUID();
   return {
     $id: `fields_${id}`,
     type: 'array',

package/dist/esm/reducers/entries.js

@@ -379,14 +379,16 @@ function getGroup(entry, selectedGroup) {
   if (selectedGroup.has('pattern')) {
     const pattern = selectedGroup.get('pattern');
     let value = '';
-    try {
-      const regex = new RegExp(pattern);
-      const matched = dataAsString.match(regex);
-      if (matched) {
-        value = matched[0];
+    if (pattern !== undefined) {
+      try {
+        const regex = new RegExp(pattern);
+        const matched = dataAsString.match(regex);
+        if (matched) {
+          value = matched[0];
+        }
+      } catch (e) {
+        console.warn(`Invalid view group pattern '${pattern}' for field '${field}'`, e);
       }
-    } catch (e) {
-      console.warn(`Invalid view group pattern '${pattern}' for field '${field}'`, e);
     }
     return {
       id: `${label}${value}`,

package/dist/esm/reducers/entryDraft.js

@@ -1,5 +1,4 @@
 import { Map, List, fromJS } from 'immutable';
-import { v4 as uuid } from 'uuid';
 import get from 'lodash/get';
 import { join, basename } from 'path';
 import { sanitizeSlug } from '../lib/urlHelper';
@@ -24,7 +23,7 @@ function entryDraftReducer(state = Map(), action) {
         state.set('fieldsMetaData', Map());
         state.set('fieldsErrors', Map());
         state.set('hasChanged', false);
-        state.set('key', uuid());
+        state.set('key', crypto.randomUUID());
       });
     case DRAFT_CREATE_EMPTY:
       // New Entry
@@ -34,7 +33,7 @@ function entryDraftReducer(state = Map(), action) {
         state.set('fieldsMetaData', Map());
         state.set('fieldsErrors', Map());
         state.set('hasChanged', false);
-        state.set('key', uuid());
+        state.set('key', crypto.randomUUID());
       });
     case DRAFT_CREATE_FROM_LOCAL_BACKUP:
       // Local Backup
@@ -47,7 +46,7 @@ function entryDraftReducer(state = Map(), action) {
         state.set('fieldsMetaData', Map());
         state.set('fieldsErrors', Map());
         state.set('hasChanged', true);
-        state.set('key', uuid());
+        state.set('key', crypto.randomUUID());
       });
     case DRAFT_CREATE_DUPLICATE_FROM_ENTRY:
       // Duplicate Entry

package/dist/esm/reducers/mediaLibrary.js

@@ -1,5 +1,4 @@
 import { Map, List } from 'immutable';
-import { v4 as uuid } from 'uuid';
 import { dirname } from 'path';
 import { MEDIA_LIBRARY_OPEN, MEDIA_LIBRARY_CLOSE, MEDIA_LIBRARY_CREATE, MEDIA_INSERT, MEDIA_REMOVE_INSERTED, MEDIA_LOAD_REQUEST, MEDIA_LOAD_SUCCESS, MEDIA_LOAD_FAILURE, MEDIA_PERSIST_REQUEST, MEDIA_PERSIST_SUCCESS, MEDIA_PERSIST_FAILURE, MEDIA_DELETE_REQUEST, MEDIA_DELETE_SUCCESS, MEDIA_DELETE_FAILURE, MEDIA_DISPLAY_URL_REQUEST, MEDIA_DISPLAY_URL_SUCCESS, MEDIA_DISPLAY_URL_FAILURE } from '../actions/mediaLibrary';
 import { selectEditingDraft, selectMediaFolder } from './entries';
@@ -110,7 +109,7 @@ function mediaLibrary(state = Map(defaultState), action) {
         }
         const filesWithKeys = files.map(file => ({
           ...file,
-          key: uuid()
+          key: crypto.randomUUID()
         }));
         return state.withMutations(map => {
           map.set('isLoading', false);
@@ -151,7 +150,7 @@ function mediaLibrary(state = Map(defaultState), action) {
         return state.withMutations(map => {
           const fileWithKey = {
             ...file,
-            key: uuid()
+            key: crypto.randomUUID()
           };
           const files = map.get('files');
           const updatedFiles = [fileWithKey, ...files];

package/dist/esm/reducers/notifications.js

@@ -1,5 +1,4 @@
 import { produce } from 'immer';
-import { v4 as uuid } from 'uuid';
 import { NOTIFICATION_SEND, NOTIFICATION_DISMISS, NOTIFICATIONS_CLEAR } from '../actions/notifications';
 const defaultState = {
   notifications: []
@@ -14,7 +13,7 @@ const notifications = produce((state, action) => {
       break;
     case NOTIFICATION_SEND:
       state.notifications = [...state.notifications, {
-        id: uuid(),
+        id: crypto.randomUUID(),
         ...action.payload
       }];
       break;

package/index.d.ts

@@ -56,7 +56,7 @@ declare module 'decap-cms-core' {
     label?: string;
     required?: boolean;
     hint?: string;
-    pattern?: [string, string];
+    pattern?: [string | RegExp, string];
     i18n?: boolean | 'translate' | 'duplicate' | 'none';
     media_folder?: string;
     public_folder?: string;
@@ -299,7 +299,7 @@ declare module 'decap-cms-core' {
   export interface ViewFilter {
     label: string;
     field: string;
-    pattern: string;
+    pattern: string | boolean;
   }
 
   export interface ViewGroup {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-core",
   "description": "Decap CMS core application, see decap-cms package for the main distribution.",
-  "version": "3.14.0",
+  "version": "3.15.0",
   "repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-core",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
   "module": "dist/esm/index.js",
@@ -25,19 +25,19 @@
   "license": "MIT",
   "dependencies": {
     "@iarna/toml": "2.2.5",
-    "@reduxjs/toolkit": "^1.9.1",
     "@vercel/stega": "^0.1.2",
+    "ajv": "^8.17.1",
+    "ajv-errors": "^3.0.0",
+    "ajv-keywords": "^5.1.0",
     "buffer": "^6.0.3",
+    "common-tags": "^1.8.0",
     "dayjs": "^1.11.10",
     "deepmerge": "^4.2.2",
     "diacritics": "^1.3.0",
     "fuzzy": "^0.1.1",
-    "gotrue-js": "^0.9.24",
     "gray-matter": "^4.0.2",
     "history": "^4.7.2",
     "immer": "^9.0.0",
-    "js-base64": "^3.0.0",
-    "jwt-decode": "^3.0.0",
     "node-polyglot": "^2.3.0",
     "path-browserify": "^1.0.1",
     "prop-types": "^15.7.2",
@@ -62,11 +62,9 @@
     "react-window": "^1.8.5",
     "redux": "^4.0.5",
     "redux-devtools-extension": "^2.13.8",
-    "redux-notifications": "^4.0.1",
     "redux-thunk": "^2.3.0",
     "remark-gfm": "1.0.0",
     "sanitize-filename": "^1.6.1",
-    "semaphore": "^1.0.5",
     "tomlify-j0.4": "^3.0.0-alpha.0",
     "url": "^0.11.0",
     "url-join": "^4.0.1",
@@ -93,10 +91,11 @@
     "@types/iarna__toml": "^2.0.5",
     "@types/redux-mock-store": "^1.0.2",
     "@types/url-join": "^4.0.0",
+    "jest-mock": "^27.5.1",
     "redux-mock-store": "^1.5.3"
   },
   "browser": {
     "path": "path-browserify"
   },
-  "gitHead": "ae01ad6f2b139f93472c8f0d049d35277d8583ca"
+  "gitHead": "567a80101f4846853701ad7d8abdc29b5e4fab56"
 }

package/src/actions/__tests__/editorialWorkflow.spec.js

@@ -8,9 +8,7 @@ import * as actions from '../editorialWorkflow';
 jest.mock('../../backend');
 jest.mock('../../valueObjects/AssetProxy');
 jest.mock('decap-cms-lib-util');
-jest.mock('uuid', () => {
-  return { v4: jest.fn().mockReturnValue('000000000000000000000') };
-});
+global.crypto.randomUUID = jest.fn().mockReturnValue('000000000000000000000');
 
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);

package/src/components/App/App.js

@@ -32,7 +32,6 @@ TopBarProgress.config({
 });
 
 const AppMainContainer = styled.div`
-  min-width: 800px;
   max-width: 1440px;
   margin: 0 auto;
 `;

package/src/components/Collection/Collection.js

@@ -26,16 +26,23 @@ import {
 } from '../../reducers/entries';
 
 const CollectionContainer = styled.div`
-  margin: ${lengths.pageMargin};
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+  margin: ${lengths.pageMarginMobile};
+  @media (min-width: 500px) {
+    margin: ${lengths.pageMargin};
+  }
 `;
 
 const CollectionMain = styled.main`
-  padding-left: 280px;
+  @media (min-width: 800px) {
+    padding-left: 280px;
+  }
 `;
 
 const SearchResultContainer = styled.div`
   ${components.cardTop};
-  margin-bottom: 22px;
 `;
 
 const SearchResultHeading = styled.h1`

package/src/components/Collection/CollectionControls.js

@@ -9,14 +9,15 @@ import GroupControl from './GroupControl';
 
 const CollectionControlsContainer = styled.div`
   display: flex;
+  flex-flow: row-reverse wrap;
   align-items: center;
-  flex-direction: row-reverse;
+  gap: 6px 0;
   margin-top: 22px;
   width: ${lengths.topCardWidth};
   max-width: 100%;
 
-  & > div {
-    margin-left: 6px;
+  @media (min-width: 500px) {
+    gap: 6px;
   }
 `;
 

package/src/components/Collection/CollectionTop.js

@@ -8,11 +8,12 @@ import { components, buttons, shadows } from 'decap-cms-ui-default';
 
 const CollectionTopContainer = styled.div`
   ${components.cardTop};
-  margin-bottom: 22px;
 `;
 
 const CollectionTopRow = styled.div`
   display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
   align-items: center;
   justify-content: space-between;
 `;
@@ -26,13 +27,13 @@ const CollectionTopNewButton = styled(Link)`
   ${shadows.dropDeep};
   ${buttons.default};
   ${buttons.gray};
+  white-space: nowrap;
 
   padding: 0 30px;
 `;
 
 const CollectionTopDescription = styled.p`
   ${components.cardTopDescription};
-  margin-bottom: 0;
 `;
 
 function getCollectionProps(collection) {

package/src/components/Collection/ControlButton.js

@@ -8,6 +8,7 @@ const Button = styled(StyledDropdownButton)`
   ${buttons.medium};
   ${buttons.grayText};
   font-size: 14px;
+  white-space: nowrap;
 
   &:after {
     top: 11px;

package/src/components/Collection/Entries/Entries.js

@@ -9,6 +9,7 @@ import EntryListing from './EntryListing';
 
 const PaginationMessage = styled.div`
   width: ${lengths.topCardWidth};
+  max-width: 100%;
   padding: 16px;
   text-align: center;
 `;

package/src/components/Collection/Sidebar.js

@@ -5,7 +5,7 @@ import styled from '@emotion/styled';
 import { css } from '@emotion/react';
 import { translate } from 'react-polyglot';
 import { NavLink } from 'react-router-dom';
-import { Icon, components, colors } from 'decap-cms-ui-default';
+import { Icon, components, colors, lengths } from 'decap-cms-ui-default';
 
 import { searchCollections } from '../../actions/collections';
 import CollectionSearch from './CollectionSearch';
@@ -21,19 +21,20 @@ const styles = {
 
 const SidebarContainer = styled.aside`
   ${components.card};
-  width: 250px;
+  width: ${lengths.topCardWidth};
+  max-width: 100%;
   padding: 8px 0 12px;
-  position: fixed;
   max-height: calc(100vh - 112px);
   display: flex;
   flex-direction: column;
+  @media (min-width: 800px) {
+    position: fixed;
+    width: 250px;
+  }
 `;
 
 const SidebarHeading = styled.h2`
-  font-size: 22px;
-  font-weight: 600;
-  line-height: 37px;
-  padding: 0;
+  ${components.cardTopHeading};
   margin: 10px 20px;
   color: ${colors.textLead};
 `;

package/src/components/Collection/__tests__/__snapshots__/Collection.spec.js.snap

@@ -3,11 +3,27 @@
 exports[`Collection should render connected component 1`] = `
 <DocumentFragment>
   .emotion-0 {
-  margin: 28px 18px;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  gap: 20px;
+  margin: 12px 8px;
 }
 
-.emotion-2 {
-  padding-left: 280px;
+@media (min-width: 500px) {
+  .emotion-0 {
+    margin: 28px 18px;
+  }
+}
+
+@media (min-width: 800px) {
+  .emotion-2 {
+    padding-left: 280px;
+  }
 }
 
 <div
@@ -45,11 +61,27 @@ exports[`Collection should render connected component 1`] = `
 exports[`Collection should render with collection with create url 1`] = `
 <DocumentFragment>
   .emotion-0 {
-  margin: 28px 18px;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  gap: 20px;
+  margin: 12px 8px;
+}
+
+@media (min-width: 500px) {
+  .emotion-0 {
+    margin: 28px 18px;
+  }
 }
 
-.emotion-2 {
-  padding-left: 280px;
+@media (min-width: 800px) {
+  .emotion-2 {
+    padding-left: 280px;
+  }
 }
 
 <div
@@ -78,11 +110,27 @@ exports[`Collection should render with collection with create url 1`] = `
 exports[`Collection should render with collection with create url and path 1`] = `
 <DocumentFragment>
   .emotion-0 {
-  margin: 28px 18px;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  gap: 20px;
+  margin: 12px 8px;
 }
 
-.emotion-2 {
-  padding-left: 280px;
+@media (min-width: 500px) {
+  .emotion-0 {
+    margin: 28px 18px;
+  }
+}
+
+@media (min-width: 800px) {
+  .emotion-2 {
+    padding-left: 280px;
+  }
 }
 
 <div
@@ -113,11 +161,27 @@ exports[`Collection should render with collection with create url and path 1`] =
 exports[`Collection should render with collection without create url 1`] = `
 <DocumentFragment>
   .emotion-0 {
-  margin: 28px 18px;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  gap: 20px;
+  margin: 12px 8px;
+}
+
+@media (min-width: 500px) {
+  .emotion-0 {
+    margin: 28px 18px;
+  }
 }
 
-.emotion-2 {
-  padding-left: 280px;
+@media (min-width: 800px) {
+  .emotion-2 {
+    padding-left: 280px;
+  }
 }
 
 <div

package/src/components/Collection/__tests__/__snapshots__/Sidebar.spec.js.snap

@@ -6,9 +6,9 @@ exports[`Sidebar should render nested collection with filterTerm 1`] = `
   box-shadow: 0 2px 6px 0 rgba(68, 74, 87, 0.05),0 1px 3px 0 rgba(68, 74, 87, 0.1);
   border-radius: 5px;
   background-color: #fff;
-  width: 250px;
+  width: 682px;
+  max-width: 100%;
   padding: 8px 0 12px;
-  position: fixed;
   max-height: calc(100vh - 112px);
   display: -webkit-box;
   display: -webkit-flex;
@@ -19,15 +19,30 @@ exports[`Sidebar should render nested collection with filterTerm 1`] = `
   flex-direction: column;
 }
 
+@media (min-width: 800px) {
+  .emotion-0 {
+    position: fixed;
+    width: 250px;
+  }
+}
+
 .emotion-2 {
-  font-size: 22px;
+  font-size: 20px;
+  line-height: 24px;
   font-weight: 600;
-  line-height: 37px;
+  margin: 0;
   padding: 0;
   margin: 10px 20px;
   color: #313d3e;
 }
 
+@media (min-width: 500px) {
+  .emotion-2 {
+    font-size: 22px;
+    line-height: 26px;
+  }
+}
+
 .emotion-4 {
   margin: 12px 0 0;
   list-style: none;
@@ -67,9 +82,9 @@ exports[`Sidebar should render sidebar with a nested collection 1`] = `
   box-shadow: 0 2px 6px 0 rgba(68, 74, 87, 0.05),0 1px 3px 0 rgba(68, 74, 87, 0.1);
   border-radius: 5px;
   background-color: #fff;
-  width: 250px;
+  width: 682px;
+  max-width: 100%;
   padding: 8px 0 12px;
-  position: fixed;
   max-height: calc(100vh - 112px);
   display: -webkit-box;
   display: -webkit-flex;
@@ -80,15 +95,30 @@ exports[`Sidebar should render sidebar with a nested collection 1`] = `
   flex-direction: column;
 }
 
+@media (min-width: 800px) {
+  .emotion-0 {
+    position: fixed;
+    width: 250px;
+  }
+}
+
 .emotion-2 {
-  font-size: 22px;
+  font-size: 20px;
+  line-height: 24px;
   font-weight: 600;
-  line-height: 37px;
+  margin: 0;
   padding: 0;
   margin: 10px 20px;
   color: #313d3e;
 }
 
+@media (min-width: 500px) {
+  .emotion-2 {
+    font-size: 22px;
+    line-height: 26px;
+  }
+}
+
 .emotion-4 {
   margin: 12px 0 0;
   list-style: none;
@@ -127,9 +157,9 @@ exports[`Sidebar should render sidebar with a simple collection 1`] = `
   box-shadow: 0 2px 6px 0 rgba(68, 74, 87, 0.05),0 1px 3px 0 rgba(68, 74, 87, 0.1);
   border-radius: 5px;
   background-color: #fff;
-  width: 250px;
+  width: 682px;
+  max-width: 100%;
   padding: 8px 0 12px;
-  position: fixed;
   max-height: calc(100vh - 112px);
   display: -webkit-box;
   display: -webkit-flex;
@@ -140,15 +170,30 @@ exports[`Sidebar should render sidebar with a simple collection 1`] = `
   flex-direction: column;
 }
 
+@media (min-width: 800px) {
+  .emotion-0 {
+    position: fixed;
+    width: 250px;
+  }
+}
+
 .emotion-2 {
-  font-size: 22px;
+  font-size: 20px;
+  line-height: 24px;
   font-weight: 600;
-  line-height: 37px;
+  margin: 0;
   padding: 0;
   margin: 10px 20px;
   color: #313d3e;
 }
 
+@media (min-width: 500px) {
+  .emotion-2 {
+    font-size: 22px;
+    line-height: 26px;
+  }
+}
+
 .emotion-4 {
   margin: 12px 0 0;
   list-style: none;
@@ -224,9 +269,9 @@ exports[`Sidebar should render sidebar without search 1`] = `
   box-shadow: 0 2px 6px 0 rgba(68, 74, 87, 0.05),0 1px 3px 0 rgba(68, 74, 87, 0.1);
   border-radius: 5px;
   background-color: #fff;
-  width: 250px;
+  width: 682px;
+  max-width: 100%;
   padding: 8px 0 12px;
-  position: fixed;
   max-height: calc(100vh - 112px);
   display: -webkit-box;
   display: -webkit-flex;
@@ -237,15 +282,30 @@ exports[`Sidebar should render sidebar without search 1`] = `
   flex-direction: column;
 }
 
+@media (min-width: 800px) {
+  .emotion-0 {
+    position: fixed;
+    width: 250px;
+  }
+}
+
 .emotion-2 {
-  font-size: 22px;
+  font-size: 20px;
+  line-height: 24px;
   font-weight: 600;
-  line-height: 37px;
+  margin: 0;
   padding: 0;
   margin: 10px 20px;
   color: #313d3e;
 }
 
+@media (min-width: 500px) {
+  .emotion-2 {
+    font-size: 22px;
+    line-height: 26px;
+  }
+}
+
 .emotion-4 {
   margin: 12px 0 0;
   list-style: none;