Merge branch 'feat/1.0' of github.com:payloadcms/payload into feat/1.0

test/fields/collections/Collapsible/index.ts

@@ -16,6 +16,16 @@ const CollapsibleFields: CollectionConfig = {
           type: 'text',
           required: true,
         },
+        {
+          name: 'group',
+          type: 'group',
+          fields: [
+            {
+              name: 'textWithinGroup',
+              type: 'text',
+            },
+          ],
+        },
       ],
     },
   ],
@@ -23,6 +33,9 @@ const CollapsibleFields: CollectionConfig = {
 
 export const collapsibleDoc = {
   text: 'Seeded collapsible doc',
+  group: {
+    textWithinGroup: 'some text within a group',
+  },
 };
 
 export default CollapsibleFields;

test/fields/collections/Tabs/index.ts

@@ -13,6 +13,10 @@ const TabsFields: CollectionConfig = {
           fields: [
             {
               name: 'array',
+              labels: {
+                singular: 'Item',
+                plural: 'Items',
+              },
               type: 'array',
               required: true,
               fields: [

test/fields/config.ts

@@ -16,11 +16,11 @@ export default buildConfig({
     BlockFields,
     CollapsibleFields,
     ConditionalLogic,
+    PointFields,
     RichTextFields,
     SelectFields,
     TabsFields,
     TextFields,
-    PointFields,
   ],
   localization: {
     defaultLocale: 'en',