payload 1.5.2 → 1.5.4

package/dist/admin/components/elements/CodeEditor/index.js

@@ -16,7 +16,7 @@ const CodeEditor = (props) => {
         className,
         (rest === null || rest === void 0 ? void 0 : rest.defaultLanguage) ? `language--${rest.defaultLanguage}` : '',
     ].filter(Boolean).join(' ');
-    return (react_1.default.createElement(react_2.default, { height: "35vh", className: classes, options: {
+    return (react_1.default.createElement(react_2.default, { height: "35vh", className: classes, theme: theme === 'dark' ? 'vs-dark' : 'vs', options: {
             detectIndentation: true,
             minimap: {
                 enabled: false,
@@ -24,7 +24,6 @@ const CodeEditor = (props) => {
             readOnly: Boolean(readOnly),
             scrollBeyondLastLine: false,
             tabSize: 2,
-            theme: theme === 'dark' ? 'vs-dark' : 'vs',
             wordWrap: 'on',
             ...options,
         }, ...rest }));

package/dist/config/types.d.ts

@@ -77,6 +77,7 @@ export type InitOptions = {
      * See Pino Docs for options: https://getpino.io/#/docs/api?id=options
      */
     loggerOptions?: LoggerOptions;
+    config?: SanitizedConfig;
 };
 /**
  * This result is calculated on the server

package/dist/globals/config/types.d.ts

@@ -82,17 +82,18 @@ export type GlobalConfig = {
         };
     };
 };
-export interface SanitizedGlobalConfig extends Omit<DeepRequired<GlobalConfig>, 'fields' | 'versions' | 'graphQL'> {
+export interface SanitizedGlobalConfig extends Omit<DeepRequired<GlobalConfig>, 'fields' | 'versions'> {
     fields: Field[];
     versions: SanitizedGlobalVersions;
-    graphQL?: {
-        name?: string;
-        type: GraphQLObjectType;
-        mutationInputType: GraphQLNonNull<any>;
-        versionType?: GraphQLObjectType;
-    };
 }
 export type Globals = {
     Model: GlobalModel;
     config: SanitizedGlobalConfig[];
+    graphQL?: {
+        [slug: string]: {
+            type: GraphQLObjectType;
+            mutationInputType: GraphQLNonNull<any>;
+            versionType?: GraphQLObjectType;
+        };
+    };
 };

package/dist/globals/graphql/init.js

@@ -27,18 +27,21 @@ function initGlobalsGraphQL(payload) {
             const global = payload.globals.config[slug];
             const { fields, versions, } = global;
             const formattedName = ((_a = global.graphQL) === null || _a === void 0 ? void 0 : _a.name) ? global.graphQL.name : (0, pluralize_1.singular)((0, formatLabels_1.toWords)(global.slug, true));
-            global.graphQL = {};
             const forceNullableObjectType = Boolean(versions === null || versions === void 0 ? void 0 : versions.drafts);
-            global.graphQL.type = (0, buildObjectType_1.default)({
-                payload,
-                name: formattedName,
-                parentName: formattedName,
-                fields,
-                forceNullable: forceNullableObjectType,
-            });
-            global.graphQL.mutationInputType = new graphql_1.GraphQLNonNull((0, buildMutationInputType_1.default)(payload, formattedName, fields, formattedName));
+            if (!payload.globals.graphQL)
+                payload.globals.graphQL = {};
+            payload.globals.graphQL[slug] = {
+                type: (0, buildObjectType_1.default)({
+                    payload,
+                    name: formattedName,
+                    parentName: formattedName,
+                    fields,
+                    forceNullable: forceNullableObjectType,
+                }),
+                mutationInputType: new graphql_1.GraphQLNonNull((0, buildMutationInputType_1.default)(payload, formattedName, fields, formattedName)),
+            };
             payload.Query.fields[formattedName] = {
-                type: global.graphQL.type,
+                type: payload.globals.graphQL[slug].type,
                 args: {
                     draft: { type: graphql_1.GraphQLBoolean },
                     ...(payload.config.localization ? {
@@ -49,9 +52,9 @@ function initGlobalsGraphQL(payload) {
                 resolve: (0, findOne_1.default)(global),
             };
             payload.Mutation.fields[`update${formattedName}`] = {
-                type: global.graphQL.type,
+                type: payload.globals.graphQL[slug].type,
                 args: {
-                    data: { type: global.graphQL.mutationInputType },
+                    data: { type: payload.globals.graphQL[slug].mutationInputType },
                     draft: { type: graphql_1.GraphQLBoolean },
                     ...(payload.config.localization ? {
                         locale: { type: payload.types.localeInputType },
@@ -86,7 +89,7 @@ function initGlobalsGraphQL(payload) {
                         type: 'date',
                     },
                 ];
-                global.graphQL.versionType = (0, buildObjectType_1.default)({
+                payload.globals.graphQL[slug].versionType = (0, buildObjectType_1.default)({
                     payload,
                     name: `${formattedName}Version`,
                     parentName: `${formattedName}Version`,
@@ -94,7 +97,7 @@ function initGlobalsGraphQL(payload) {
                     forceNullable: forceNullableObjectType,
                 });
                 payload.Query.fields[`version${(0, formatName_1.default)(formattedName)}`] = {
-                    type: global.graphQL.versionType,
+                    type: payload.globals.graphQL[slug].versionType,
                     args: {
                         id: { type: graphql_1.GraphQLString },
                         ...(payload.config.localization ? {
@@ -105,7 +108,7 @@ function initGlobalsGraphQL(payload) {
                     resolve: (0, findVersionByID_1.default)(global),
                 };
                 payload.Query.fields[`versions${formattedName}`] = {
-                    type: (0, buildPaginatedListType_1.default)(`versions${(0, formatName_1.default)(formattedName)}`, global.graphQL.versionType),
+                    type: (0, buildPaginatedListType_1.default)(`versions${(0, formatName_1.default)(formattedName)}`, payload.globals.graphQL[slug].versionType),
                     args: {
                         where: {
                             type: (0, buildWhereInputType_1.default)(`versions${formattedName}`, versionGlobalFields, `versions${formattedName}`),
@@ -121,7 +124,7 @@ function initGlobalsGraphQL(payload) {
                     resolve: (0, findVersions_1.default)(global),
                 };
                 payload.Mutation.fields[`restoreVersion${(0, formatName_1.default)(formattedName)}`] = {
-                    type: global.graphQL.type,
+                    type: payload.globals.graphQL[slug].type,
                     args: {
                         id: { type: graphql_1.GraphQLString },
                     },

package/dist/init.js

@@ -7,6 +7,7 @@ exports.initSync = exports.initAsync = exports.init = void 0;
 /* eslint-disable no-param-reassign */
 const express_1 = __importDefault(require("express"));
 const crypto_1 = __importDefault(require("crypto"));
+const path_1 = __importDefault(require("path"));
 const mongoose_1 = __importDefault(require("mongoose"));
 const authenticate_1 = __importDefault(require("./express/middleware/authenticate"));
 const connect_1 = __importDefault(require("./mongoose/connect"));
@@ -31,6 +32,7 @@ const logger_1 = __importDefault(require("./utilities/logger"));
 const dataloader_1 = require("./collections/dataloader");
 const mountEndpoints_1 = __importDefault(require("./express/mountEndpoints"));
 const model_1 = __importDefault(require("./preferences/model"));
+const find_1 = __importDefault(require("./config/find"));
 const init = (payload, options) => {
     payload.logger.info('Starting Payload...');
     if (!options.secret) {
@@ -46,7 +48,21 @@ const init = (payload, options) => {
         .digest('hex')
         .slice(0, 32);
     payload.local = options.local;
-    payload.config = (0, load_1.default)(payload.logger);
+    if (options.config) {
+        payload.config = options.config;
+        const configPath = (0, find_1.default)();
+        payload.config = {
+            ...options.config,
+            paths: {
+                configDir: path_1.default.dirname(configPath),
+                config: configPath,
+                rawConfig: configPath,
+            },
+        };
+    }
+    else {
+        payload.config = (0, load_1.default)(payload.logger);
+    }
     // If not initializing locally, scaffold router
     if (!payload.local) {
         payload.router = express_1.default.Router();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "Node, React and MongoDB Headless CMS and Application Framework",
   "license": "MIT",
   "engines": {