payload 1.0.5 → 1.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/dist/index.js +3 -3
- package/dist/init.d.ts +3 -1
- package/dist/init.js +27 -11
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [1.0.6](https://github.com/payloadcms/payload/compare/v1.0.5...v1.0.6) (2022-07-19)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* improves initAsync pattern ([428edb0](https://github.com/payloadcms/payload/commit/428edb05c4d8805bb2c4fb98f51e57eed2926374))
|
|
7
|
+
|
|
1
8
|
## [1.0.5](https://github.com/payloadcms/payload/compare/v1.0.4...v1.0.5) (2022-07-19)
|
|
2
9
|
|
|
3
10
|
|
package/dist/index.js
CHANGED
|
@@ -151,14 +151,14 @@ class Payload {
|
|
|
151
151
|
* @param options
|
|
152
152
|
*/
|
|
153
153
|
init(options) {
|
|
154
|
-
(0, init_1.
|
|
154
|
+
(0, init_1.initSync)(this, options);
|
|
155
155
|
}
|
|
156
156
|
async initAsync(options) {
|
|
157
|
-
await (0, init_1.
|
|
157
|
+
await (0, init_1.initAsync)(this, options);
|
|
158
158
|
}
|
|
159
159
|
}
|
|
160
160
|
exports.Payload = Payload;
|
|
161
161
|
const payload = new Payload();
|
|
162
162
|
exports.default = payload;
|
|
163
163
|
module.exports = payload;
|
|
164
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
164
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBbUJBLDJFQUE2RDtBQUM3RCx1RUFBK0Q7QUFDL0QsMENBQWlEO0FBeUJqRCxpQ0FBNkM7QUFFN0MsT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBQUM7QUFFNUI7O0dBRUc7QUFDSCxNQUFhLE9BQU87SUFBcEI7UUFHRSxnQkFBVyxHQUVQLEVBQUUsQ0FBQTtRQUVOLGFBQVEsR0FFSixFQUFFLENBQUE7UUEwQk4sWUFBTyxHQUFHLGdCQUFPLENBQUM7UUFFbEIsWUFBTyxHQUFHLGdCQUFPLENBQUM7UUFhbEIsVUFBSyxHQUFxRCxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBRXhGLGFBQVEsR0FBcUQsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUUsQ0FBQztRQVU5RixtQkFBYyxHQUE0QixFQUFFLENBQUM7UUFnQjdDLGdCQUFXLEdBQUcsR0FBVyxFQUFFLENBQUMsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUVsRixjQUFTLEdBQUcsR0FBVyxFQUFFLENBQUMsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUU5RTs7OztXQUlHO1FBQ0gsV0FBTSxHQUFHLEtBQUssRUFBVyxPQUF5QixFQUFjLEVBQUU7WUFDaEUsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLGVBQWUsQ0FBQztZQUNuQyxPQUFPLE1BQU0sQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDL0IsQ0FBQyxDQUFBO1FBRUQ7Ozs7V0FJRztRQUNILFNBQUksR0FB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
|
package/dist/init.d.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import { InitOptions } from './config/types';
|
|
2
2
|
import { Payload } from '.';
|
|
3
|
-
export declare const init: (payload: Payload, options: InitOptions) =>
|
|
3
|
+
export declare const init: (payload: Payload, options: InitOptions) => void;
|
|
4
|
+
export declare const initAsync: (payload: Payload, options: InitOptions) => Promise<void>;
|
|
5
|
+
export declare const initSync: (payload: Payload, options: InitOptions) => void;
|
package/dist/init.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.init = void 0;
|
|
6
|
+
exports.initSync = exports.initAsync = exports.init = void 0;
|
|
7
7
|
/* eslint-disable no-param-reassign */
|
|
8
8
|
const express_1 = __importDefault(require("express"));
|
|
9
9
|
const crypto_1 = __importDefault(require("crypto"));
|
|
@@ -27,8 +27,7 @@ const sendEmail_1 = __importDefault(require("./email/sendEmail"));
|
|
|
27
27
|
const serverInit_1 = require("./utilities/telemetry/events/serverInit");
|
|
28
28
|
const load_1 = __importDefault(require("./config/load"));
|
|
29
29
|
const logger_1 = __importDefault(require("./utilities/logger"));
|
|
30
|
-
const init =
|
|
31
|
-
payload.logger = (0, logger_1.default)('payload', options.loggerOptions);
|
|
30
|
+
const init = (payload, options) => {
|
|
32
31
|
payload.logger.info('Starting Payload...');
|
|
33
32
|
if (!options.secret) {
|
|
34
33
|
throw new Error('Error: missing secret key. A secret key is needed to secure Payload.');
|
|
@@ -42,13 +41,8 @@ const init = async (payload, options) => {
|
|
|
42
41
|
.update(options.secret)
|
|
43
42
|
.digest('hex')
|
|
44
43
|
.slice(0, 32);
|
|
45
|
-
payload.mongoURL = options.mongoURL;
|
|
46
44
|
payload.local = options.local;
|
|
47
45
|
payload.config = (0, load_1.default)(payload.logger);
|
|
48
|
-
// Connect to database
|
|
49
|
-
if (payload.mongoURL) {
|
|
50
|
-
payload.mongoMemoryServer = await (0, connect_1.default)(payload.mongoURL, options.mongoOptions, payload.logger);
|
|
51
|
-
}
|
|
52
46
|
// If not initializing locally, scaffold router
|
|
53
47
|
if (!payload.local) {
|
|
54
48
|
payload.router = express_1.default.Router();
|
|
@@ -89,11 +83,33 @@ const init = async (payload, options) => {
|
|
|
89
83
|
payload.router.use(payload.errorHandler);
|
|
90
84
|
payload.authenticate = (0, authenticate_1.default)(payload.config);
|
|
91
85
|
}
|
|
86
|
+
(0, serverInit_1.serverInit)(payload);
|
|
87
|
+
};
|
|
88
|
+
exports.init = init;
|
|
89
|
+
const initAsync = async (payload, options) => {
|
|
90
|
+
payload.logger = (0, logger_1.default)('payload', options.loggerOptions);
|
|
91
|
+
payload.mongoURL = options.mongoURL;
|
|
92
|
+
if (payload.mongoURL) {
|
|
93
|
+
payload.mongoMemoryServer = await (0, connect_1.default)(payload.mongoURL, options.mongoOptions, payload.logger);
|
|
94
|
+
}
|
|
95
|
+
(0, exports.init)(payload, options);
|
|
92
96
|
if (typeof options.onInit === 'function')
|
|
93
97
|
await options.onInit(payload);
|
|
94
98
|
if (typeof payload.config.onInit === 'function')
|
|
95
99
|
await payload.config.onInit(payload);
|
|
96
|
-
(0, serverInit_1.serverInit)(payload);
|
|
97
100
|
};
|
|
98
|
-
exports.
|
|
99
|
-
|
|
101
|
+
exports.initAsync = initAsync;
|
|
102
|
+
const initSync = (payload, options) => {
|
|
103
|
+
payload.logger = (0, logger_1.default)('payload', options.loggerOptions);
|
|
104
|
+
payload.mongoURL = options.mongoURL;
|
|
105
|
+
if (payload.mongoURL) {
|
|
106
|
+
(0, connect_1.default)(payload.mongoURL, options.mongoOptions, payload.logger);
|
|
107
|
+
}
|
|
108
|
+
(0, exports.init)(payload, options);
|
|
109
|
+
if (typeof options.onInit === 'function')
|
|
110
|
+
options.onInit(payload);
|
|
111
|
+
if (typeof payload.config.onInit === 'function')
|
|
112
|
+
payload.config.onInit(payload);
|
|
113
|
+
};
|
|
114
|
+
exports.initSync = initSync;
|
|
115
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5pdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbml0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLHNDQUFzQztBQUN0QyxzREFBNEM7QUFDNUMsb0RBQTRCO0FBTTVCLHFGQUE2RDtBQUM3RCxpRUFBaUQ7QUFDakQsc0VBQXFEO0FBQ3JELDREQUF3QztBQUN4Qyx1REFBbUM7QUFDbkMsMkVBQW1EO0FBQ25ELDhEQUFpRDtBQUNqRCw4REFBaUQ7QUFDakQsMERBQXlDO0FBQ3pDLDhFQUE2RDtBQUM3RCw4REFBMEM7QUFDMUMsOEVBQXNEO0FBQ3RELDhFQUFzRDtBQUN0RCwwREFBdUM7QUFDdkMsbUZBQTJEO0FBQzNELHFGQUE2RDtBQUU3RCxrRUFBMEM7QUFFMUMsd0VBQTRGO0FBRTVGLHlEQUF1QztBQUN2QyxnRUFBd0M7QUFFakMsTUFBTSxJQUFJLEdBQUcsQ0FBQyxPQUFnQixFQUFFLE9BQW9CLEVBQVEsRUFBRTtJQUNuRSxPQUFPLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0lBQzNDLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFO1FBQ25CLE1BQU0sSUFBSSxLQUFLLENBQ2Isc0VBQXNFLENBQ3ZFLENBQUM7S0FDSDtJQUVELElBQUksT0FBTyxDQUFDLFFBQVEsS0FBSyxLQUFLLElBQUksT0FBTyxPQUFPLENBQUMsUUFBUSxLQUFLLFFBQVEsRUFBRTtRQUN0RSxNQUFNLElBQUksS0FBSyxDQUFDLHdDQUF3QyxDQUFDLENBQUM7S0FDM0Q7SUFFRCxPQUFPLENBQUMsWUFBWSxHQUFHLEVBQUUsR0FBRyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO0lBQzlDLE9BQU8sQ0FBQyxNQUFNLEdBQUcsZ0JBQU07U0FDcEIsVUFBVSxDQUFDLFFBQVEsQ0FBQztTQUNwQixNQUFNLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQztTQUN0QixNQUFNLENBQUMsS0FB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
|