From 779a60a42cf81acc3037d74dc4dfa6bb23447e85 Mon Sep 17 00:00:00 2001 From: James Date: Sat, 16 Jul 2022 10:41:54 -0700 Subject: [PATCH 1/6] chore: removes unused dependencies --- .../forms/field-types/RichText/elements/link/index.tsx | 2 -- test/uploads/media/.gitkeep | 0 2 files changed, 2 deletions(-) delete mode 100644 test/uploads/media/.gitkeep diff --git a/src/admin/components/forms/field-types/RichText/elements/link/index.tsx b/src/admin/components/forms/field-types/RichText/elements/link/index.tsx index 5f158b0304..2966f8fe07 100644 --- a/src/admin/components/forms/field-types/RichText/elements/link/index.tsx +++ b/src/admin/components/forms/field-types/RichText/elements/link/index.tsx @@ -10,13 +10,11 @@ import Check from '../../../../../icons/Check'; import Error from '../../../../Error'; import './index.scss'; -import { useTheme } from '../../../../../utilities/Theme'; const baseClass = 'rich-text-link'; const Link = ({ attributes, children, element, editorRef }) => { const editor = useSlate(); - const { theme } = useTheme(); const [error, setError] = useState(false); const [open, setOpen] = useState(element.url === undefined); diff --git a/test/uploads/media/.gitkeep b/test/uploads/media/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 From fcd3b0d2cbabd6fda088174111ea8d4f5eeb5434 Mon Sep 17 00:00:00 2001 From: James Date: Sat, 16 Jul 2022 10:59:25 -0700 Subject: [PATCH 2/6] chore: updates version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 522b92da96..dd75c21196 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "payload", - "version": "0.19.2", + "version": "0.20.1", "description": "Node, React and MongoDB Headless CMS and Application Framework", "license": "MIT", "author": { From 34d0b893767c9bd81886518adadc385f3b85c941 Mon Sep 17 00:00:00 2001 From: James Date: Sat, 16 Jul 2022 11:01:09 -0700 Subject: [PATCH 3/6] chore: increases jest timeout --- jest.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jest.config.js b/jest.config.js index 40ac01b5d6..c2b217ac7f 100644 --- a/jest.config.js +++ b/jest.config.js @@ -5,7 +5,7 @@ module.exports = { '**/test/**/*int.spec.ts', ], globalSetup: './test/jest.setup.ts', - testTimeout: 15000, + testTimeout: 90000, moduleNameMapper: { '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '/src/webpack/mocks/fileMock.js', '\\.(css|scss)$': '/src/webpack/mocks/emptyModule.js', From 624e25c07739e3a398d93d4775ea4f89b231763e Mon Sep 17 00:00:00 2001 From: James Date: Sat, 16 Jul 2022 11:06:06 -0700 Subject: [PATCH 4/6] chore: adds pretest --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index dd75c21196..127b6f0c3c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "payload", - "version": "0.20.1", + "version": "0.20.2-beta.0", "description": "Node, React and MongoDB Headless CMS and Application Framework", "license": "MIT", "author": { @@ -39,6 +39,7 @@ "demo:serve": "cross-env PAYLOAD_CONFIG_PATH=demo/payload.config.ts NODE_ENV=production nodemon", "dev": "nodemon", "dev:generatetypes": "node ./test/generateTypes.js", + "pretest": "yarn build", "test": "yarn test:int && yarn test:components", "test:int": "cross-env NODE_ENV=test DISABLE_LOGGING=true jest --forceExit --detectOpenHandles", "test:e2e": "cross-env NODE_ENV=test DISABLE_LOGGING=true playwright test", From a7770328948e3acf5f4b2968c004ec0172548123 Mon Sep 17 00:00:00 2001 From: James Date: Sat, 16 Jul 2022 11:11:14 -0700 Subject: [PATCH 5/6] chore: only imports get-port if dev --- package.json | 2 +- src/mongoose/connect.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 127b6f0c3c..bf8146e4d1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "payload", - "version": "0.20.2-beta.0", + "version": "0.20.3-beta.0", "description": "Node, React and MongoDB Headless CMS and Application Framework", "license": "MIT", "author": { diff --git a/src/mongoose/connect.ts b/src/mongoose/connect.ts index 6220e00ab3..42f1c9a2e6 100644 --- a/src/mongoose/connect.ts +++ b/src/mongoose/connect.ts @@ -1,6 +1,7 @@ +/* eslint-disable @typescript-eslint/no-var-requires */ +/* eslint-disable global-require */ import mongoose, { ConnectOptions } from 'mongoose'; import pino from 'pino'; -import getPort from 'get-port'; import { connection } from './testCredentials'; const connectMongoose = async ( @@ -20,8 +21,9 @@ const connectMongoose = async ( if (process.env.NODE_ENV === 'test') { connectionOptions.dbName = 'payloadmemory'; - // eslint-disable-next-line global-require, @typescript-eslint/no-var-requires const { MongoMemoryServer } = require('mongodb-memory-server'); + const getPort = require('get-port'); + const port = await getPort(); mongoMemoryServer = await MongoMemoryServer.create({ instance: { From e8b72f186f9697f340092752e6926a558d8704dc Mon Sep 17 00:00:00 2001 From: James Date: Sat, 16 Jul 2022 11:27:28 -0700 Subject: [PATCH 6/6] chore: restores deprecated features for ease of uploading --- package.json | 2 +- src/admin/scss/vars.scss | 20 ++++++++++++++++++++ src/fields/config/schema.ts | 2 ++ src/fields/config/types.ts | 4 ++++ src/graphql/schema/buildMutationInputType.ts | 4 ++++ src/graphql/schema/buildObjectType.ts | 5 +++++ 6 files changed, 36 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index bf8146e4d1..ffb62ae106 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "payload", - "version": "0.20.3-beta.0", + "version": "0.20.4-beta.0", "description": "Node, React and MongoDB Headless CMS and Application Framework", "license": "MIT", "author": { diff --git a/src/admin/scss/vars.scss b/src/admin/scss/vars.scss index 52b53a0de4..89a4e347f0 100644 --- a/src/admin/scss/vars.scss +++ b/src/admin/scss/vars.scss @@ -21,6 +21,26 @@ $baseline : math.div($baseline-px, $baseline-body-size)+rem; @return math.div($baseline-px, $baseline-body-size) * $multiplier +rem; } +////////////////////////////// +// FONTS (LEGACY - DO NOT USE. PREFER CSS VARIABLES) +////////////////////////////// + +$font-body : 'Suisse Intl' !default; +$font-mono : monospace !default; + +////////////////////////////// +// COLORS (LEGACY - DO NOT USE. PREFER CSS VARIABLES) +////////////////////////////// + +$color-dark-gray : #333333 !default; +$color-gray : #9A9A9A !default; +$color-light-gray : #DADADA !default; +$color-background-gray : #F3F3F3 !default; +$color-red : #ff6f76 !default; +$color-yellow : #FDFFA4 !default; +$color-green : #B2FFD6 !default; +$color-purple : #F3DDF3 !default; + ////////////////////////////// // STYLES ////////////////////////////// diff --git a/src/fields/config/schema.ts b/src/fields/config/schema.ts index 870ef1152a..80b513268b 100644 --- a/src/fields/config/schema.ts +++ b/src/fields/config/schema.ts @@ -203,6 +203,7 @@ export const group = baseField.keys({ joi.func(), ), admin: baseAdminFields.keys({ + hideGutter: joi.boolean().default(false), description: joi.string(), }), }); @@ -306,6 +307,7 @@ export const richText = baseField.keys({ ), admin: baseAdminFields.keys({ placeholder: joi.string(), + hideGutter: joi.boolean().default(false), elements: joi.array().items( joi.alternatives().try( joi.string(), diff --git a/src/fields/config/types.ts b/src/fields/config/types.ts index 6e73d027fe..c48d9f9c3d 100644 --- a/src/fields/config/types.ts +++ b/src/fields/config/types.ts @@ -160,6 +160,9 @@ export type DateField = FieldBase & { export type GroupField = FieldBase & { type: 'group'; fields: Field[]; + admin?: Admin & { + hideGutter?: boolean + } } export type RowAdmin = Omit; @@ -275,6 +278,7 @@ export type RichTextField = FieldBase & { placeholder?: string elements?: RichTextElement[]; leaves?: RichTextLeaf[]; + hideGutter?: boolean upload?: { collections: { [collection: string]: { diff --git a/src/graphql/schema/buildMutationInputType.ts b/src/graphql/schema/buildMutationInputType.ts index 11a18dd170..69c5944471 100644 --- a/src/graphql/schema/buildMutationInputType.ts +++ b/src/graphql/schema/buildMutationInputType.ts @@ -202,6 +202,10 @@ function buildMutationInputType(payload: Payload, name: string, fields: Field[], fields: fields.reduce((inputObjectTypeConfig, field) => { const fieldSchema = fieldToSchemaMap[field.type]; + if (typeof fieldSchema !== 'function') { + return inputObjectTypeConfig; + } + return { ...inputObjectTypeConfig, ...fieldSchema(inputObjectTypeConfig, field), diff --git a/src/graphql/schema/buildObjectType.ts b/src/graphql/schema/buildObjectType.ts index cc549703fe..afde906dff 100644 --- a/src/graphql/schema/buildObjectType.ts +++ b/src/graphql/schema/buildObjectType.ts @@ -494,6 +494,11 @@ function buildObjectType(payload: Payload, name: string, fields: Field[], parent name, fields: () => fields.reduce((objectTypeConfig, field) => { const fieldSchema = fieldToSchemaMap[field.type]; + + if (typeof fieldSchema !== 'function') { + return objectTypeConfig; + } + return { ...objectTypeConfig, ...fieldSchema(objectTypeConfig, field),