payload 1.6.3 → 1.6.4
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/dist/collections/config/schema.js +2 -0
- package/dist/collections/config/schema.js.map +1 -1
- package/dist/collections/operations/create.js +16 -0
- package/dist/collections/operations/create.js.map +1 -1
- package/dist/collections/operations/delete.js +7 -5
- package/dist/collections/operations/delete.js.map +1 -1
- package/dist/collections/operations/update.js +16 -0
- package/dist/collections/operations/update.js.map +1 -1
- package/dist/config/types.d.ts +2 -2
- package/dist/fields/hooks/afterRead/promise.js +2 -1
- package/dist/fields/hooks/afterRead/promise.js.map +1 -1
- package/dist/uploads/generateFileData.js +97 -85
- package/dist/uploads/generateFileData.js.map +1 -1
- package/dist/uploads/getImageSize.d.ts +2 -7
- package/dist/uploads/getImageSize.js +5 -2
- package/dist/uploads/getImageSize.js.map +1 -1
- package/dist/uploads/imageResizer.d.ts +2 -2
- package/dist/uploads/imageResizer.js +2 -1
- package/dist/uploads/imageResizer.js.map +1 -1
- package/dist/uploads/types.d.ts +7 -0
- package/docs/getting-started/installation.mdx +1 -1
- package/package.json +2 -1
|
@@ -117,6 +117,8 @@ const collectionSchema = joi_1.default.object().keys({
|
|
|
117
117
|
staticURL: joi_1.default.string(),
|
|
118
118
|
staticDir: joi_1.default.string(),
|
|
119
119
|
disableLocalStorage: joi_1.default.bool(),
|
|
120
|
+
useTempFiles: joi_1.default.bool(),
|
|
121
|
+
tempFileDir: joi_1.default.string(),
|
|
120
122
|
adminThumbnail: joi_1.default.alternatives().try(joi_1.default.string(), joi_1.default.func()),
|
|
121
123
|
imageSizes: joi_1.default.array().items(joi_1.default.object().keys({
|
|
122
124
|
name: joi_1.default.string(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/collections/config/schema.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/collections/config/schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,8 @@ 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
|
+
const fs_1 = __importDefault(require("fs"));
|
|
7
|
+
const util_1 = require("util");
|
|
6
8
|
const crypto_1 = __importDefault(require("crypto"));
|
|
7
9
|
const executeAccess_1 = __importDefault(require("../../auth/executeAccess"));
|
|
8
10
|
const sanitizeInternalFields_1 = __importDefault(require("../../utilities/sanitizeInternalFields"));
|
|
@@ -16,7 +18,10 @@ const afterChange_1 = require("../../fields/hooks/afterChange");
|
|
|
16
18
|
const afterRead_1 = require("../../fields/hooks/afterRead");
|
|
17
19
|
const generateFileData_1 = require("../../uploads/generateFileData");
|
|
18
20
|
const saveVersion_1 = require("../../versions/saveVersion");
|
|
21
|
+
const mapAsync_1 = require("../../utilities/mapAsync");
|
|
22
|
+
const unlinkFile = (0, util_1.promisify)(fs_1.default.unlink);
|
|
19
23
|
async function create(incomingArgs) {
|
|
24
|
+
var _a;
|
|
20
25
|
let args = incomingArgs;
|
|
21
26
|
// /////////////////////////////////////
|
|
22
27
|
// beforeOperation - Collection
|
|
@@ -222,6 +227,17 @@ async function create(incomingArgs) {
|
|
|
222
227
|
operation: 'create',
|
|
223
228
|
}) || result;
|
|
224
229
|
}, Promise.resolve());
|
|
230
|
+
// Remove temp files if enabled, as express-fileupload does not do this automatically
|
|
231
|
+
if (((_a = config.upload) === null || _a === void 0 ? void 0 : _a.useTempFiles) && collectionConfig.upload) {
|
|
232
|
+
const { files } = req;
|
|
233
|
+
const fileArray = Array.isArray(files) ? files : [files];
|
|
234
|
+
await (0, mapAsync_1.mapAsync)(fileArray, async ({ file }) => {
|
|
235
|
+
// Still need this check because this will not be populated if using local API
|
|
236
|
+
if (file.tempFilePath) {
|
|
237
|
+
await unlinkFile(file.tempFilePath);
|
|
238
|
+
}
|
|
239
|
+
});
|
|
240
|
+
}
|
|
225
241
|
// /////////////////////////////////////
|
|
226
242
|
// Return results
|
|
227
243
|
// /////////////////////////////////////
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/collections/operations/create.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAG5B,6EAAqD;AACrD,oGAA4E;AAE5E,yCAA+C;AAE/C,6FAAqE;AAIrE,qDAA6D;AAC7D,2DAAwD;AACxD,kEAA+D;AAC/D,sEAAmE;AACnE,gEAA6D;AAC7D,4DAAyD;AACzD,qEAAkE;AAClE,4DAAyD;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/collections/operations/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -111,11 +111,13 @@ async function deleteOperation(incomingArgs) {
|
|
|
111
111
|
// /////////////////////////////////////
|
|
112
112
|
// Delete versions
|
|
113
113
|
// /////////////////////////////////////
|
|
114
|
-
(
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
114
|
+
if (collectionConfig.versions) {
|
|
115
|
+
(0, deleteCollectionVersions_1.deleteCollectionVersions)({
|
|
116
|
+
payload,
|
|
117
|
+
id,
|
|
118
|
+
slug: collectionConfig.slug,
|
|
119
|
+
});
|
|
120
|
+
}
|
|
119
121
|
// /////////////////////////////////////
|
|
120
122
|
// afterDelete - Collection
|
|
121
123
|
// /////////////////////////////////////
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/collections/operations/delete.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/collections/operations/delete.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,8 @@ 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
|
+
const fs_1 = __importDefault(require("fs"));
|
|
7
|
+
const util_1 = require("util");
|
|
6
8
|
const http_status_1 = __importDefault(require("http-status"));
|
|
7
9
|
const sanitizeInternalFields_1 = __importDefault(require("../../utilities/sanitizeInternalFields"));
|
|
8
10
|
const executeAccess_1 = __importDefault(require("../../auth/executeAccess"));
|
|
@@ -16,7 +18,10 @@ const afterChange_1 = require("../../fields/hooks/afterChange");
|
|
|
16
18
|
const afterRead_1 = require("../../fields/hooks/afterRead");
|
|
17
19
|
const generateFileData_1 = require("../../uploads/generateFileData");
|
|
18
20
|
const getLatestCollectionVersion_1 = require("../../versions/getLatestCollectionVersion");
|
|
21
|
+
const mapAsync_1 = require("../../utilities/mapAsync");
|
|
22
|
+
const unlinkFile = (0, util_1.promisify)(fs_1.default.unlink);
|
|
19
23
|
async function update(incomingArgs) {
|
|
24
|
+
var _a;
|
|
20
25
|
let args = incomingArgs;
|
|
21
26
|
// /////////////////////////////////////
|
|
22
27
|
// beforeOperation - Collection
|
|
@@ -236,6 +241,17 @@ async function update(incomingArgs) {
|
|
|
236
241
|
operation: 'update',
|
|
237
242
|
}) || result;
|
|
238
243
|
}, Promise.resolve());
|
|
244
|
+
// Remove temp files if enabled, as express-fileupload does not do this automatically
|
|
245
|
+
if (((_a = config.upload) === null || _a === void 0 ? void 0 : _a.useTempFiles) && collectionConfig.upload) {
|
|
246
|
+
const { files } = req;
|
|
247
|
+
const fileArray = Array.isArray(files) ? files : [files];
|
|
248
|
+
await (0, mapAsync_1.mapAsync)(fileArray, async ({ file }) => {
|
|
249
|
+
// Still need this check because this will not be populated if using local API
|
|
250
|
+
if (file.tempFilePath) {
|
|
251
|
+
await unlinkFile(file.tempFilePath);
|
|
252
|
+
}
|
|
253
|
+
});
|
|
254
|
+
}
|
|
239
255
|
// /////////////////////////////////////
|
|
240
256
|
// Return results
|
|
241
257
|
// /////////////////////////////////////
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/collections/operations/update.ts"],"names":[],"mappings":";;;;;AAAA,8DAAqC;AAKrC,oGAA4E;AAC5E,6EAAqD;AACrD,yCAA8E;AAE9E,4CAAwD;AACxD,4DAAyD;AACzD,2DAAwD;AACxD,kEAA+D;AAC/D,sEAAmE;AACnE,gEAA6D;AAC7D,4DAAyD;AACzD,qEAAkE;AAClE,0FAAmF;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/collections/operations/update.ts"],"names":[],"mappings":"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"}
|
package/dist/config/types.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Express, NextFunction, Response } from 'express';
|
|
2
2
|
import { DeepRequired } from 'ts-essentials';
|
|
3
3
|
import { Transporter } from 'nodemailer';
|
|
4
|
-
import { Options } from 'express-fileupload';
|
|
4
|
+
import { Options as ExpressFileUploadOptions } from 'express-fileupload';
|
|
5
5
|
import { Configuration } from 'webpack';
|
|
6
6
|
import SMTPConnection from 'nodemailer/lib/smtp-connection';
|
|
7
7
|
import GraphQL from 'graphql';
|
|
@@ -423,7 +423,7 @@ export type Config = {
|
|
|
423
423
|
/**
|
|
424
424
|
* Customize the handling of incoming file uploads for collections that have uploads enabled.
|
|
425
425
|
*/
|
|
426
|
-
upload?:
|
|
426
|
+
upload?: ExpressFileUploadOptions;
|
|
427
427
|
/**
|
|
428
428
|
* Translate your content to different languages/locales.
|
|
429
429
|
*
|
|
@@ -25,7 +25,8 @@ const promise = async ({ currentDepth, depth, doc, field, fieldPromises, findMan
|
|
|
25
25
|
&& (0, types_1.fieldAffectsData)(field)
|
|
26
26
|
&& (typeof siblingDoc[field.name] === 'object' && siblingDoc[field.name] !== null)
|
|
27
27
|
&& field.localized
|
|
28
|
-
&& req.locale !== 'all'
|
|
28
|
+
&& req.locale !== 'all'
|
|
29
|
+
&& req.payload.config.localization;
|
|
29
30
|
if (shouldHoistLocalizedValue) {
|
|
30
31
|
// replace actual value with localized value before sanitizing
|
|
31
32
|
// { [locale]: fields } -> fields
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promise.js","sourceRoot":"","sources":["../../../../src/fields/hooks/afterRead/promise.ts"],"names":[],"mappings":";;;;;;AAAA,sCAAsC;AACtC,8CAAqF;AAErF,qDAAkD;AAClD,6GAAqF;AACrF,oGAA4E;AAiB5E,oEAAoE;AACpE,uCAAuC;AACvC,0CAA0C;AAC1C,8CAA8C;AAC9C,wBAAwB;AACxB,gCAAgC;AAChC,2BAA2B;AAEpB,MAAM,OAAO,GAAG,KAAK,EAAE,EAC5B,YAAY,EACZ,KAAK,EACL,GAAG,EACH,KAAK,EACL,aAAa,EACb,QAAQ,EACR,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,GAAG,EACH,UAAU,EACV,gBAAgB,GACX,EAAiB,EAAE;;IACxB,IAAI,IAAA,wBAAgB,EAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,IAAI,OAAO,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,WAAW,IAAI,CAAC,gBAAgB,EAAE;QACjH,OAAO,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;KAC/B;IAED,MAAM,yBAAyB,GAAG,cAAc;WAC3C,IAAA,wBAAgB,EAAC,KAAK,CAAC;WACvB,CAAC,OAAO,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,QAAQ,IAAI,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;WAC/E,KAAK,CAAC,SAAS;WACf,GAAG,CAAC,MAAM,KAAK,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"promise.js","sourceRoot":"","sources":["../../../../src/fields/hooks/afterRead/promise.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,98 +16,110 @@ const imageResizer_1 = __importDefault(require("./imageResizer"));
|
|
|
16
16
|
const canResizeImage_1 = __importDefault(require("./canResizeImage"));
|
|
17
17
|
const isImage_1 = __importDefault(require("./isImage"));
|
|
18
18
|
const generateFileData = async ({ config, collection: { config: collectionConfig, Model, }, req, data, throwOnMissingFile, overwriteExistingFiles, }) => {
|
|
19
|
+
if (!collectionConfig.upload) {
|
|
20
|
+
return {
|
|
21
|
+
data,
|
|
22
|
+
files: [],
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
const { file } = req.files || {};
|
|
26
|
+
if (!file) {
|
|
27
|
+
if (throwOnMissingFile)
|
|
28
|
+
throw new errors_1.MissingFile(req.t);
|
|
29
|
+
return {
|
|
30
|
+
data,
|
|
31
|
+
files: [],
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
const { staticDir, imageSizes, disableLocalStorage, resizeOptions, formatOptions } = collectionConfig.upload;
|
|
35
|
+
let staticPath = staticDir;
|
|
36
|
+
if (staticDir.indexOf('/') !== 0) {
|
|
37
|
+
staticPath = path_1.default.resolve(config.paths.configDir, staticDir);
|
|
38
|
+
}
|
|
39
|
+
if (!disableLocalStorage) {
|
|
40
|
+
mkdirp_1.default.sync(staticPath);
|
|
41
|
+
}
|
|
19
42
|
let newData = data;
|
|
20
43
|
const filesToSave = [];
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
44
|
+
const fileData = {};
|
|
45
|
+
try {
|
|
46
|
+
const fileSupportsResize = (0, canResizeImage_1.default)(file.mimetype);
|
|
47
|
+
let fsSafeName;
|
|
48
|
+
let originalFile;
|
|
49
|
+
let dimensions;
|
|
50
|
+
let fileBuffer;
|
|
51
|
+
let ext;
|
|
52
|
+
let mime;
|
|
53
|
+
if (fileSupportsResize) {
|
|
54
|
+
if (file.tempFilePath) {
|
|
55
|
+
originalFile = (0, sharp_1.default)(file.tempFilePath);
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
originalFile = (0, sharp_1.default)(file.data);
|
|
59
|
+
}
|
|
60
|
+
if (resizeOptions) {
|
|
61
|
+
originalFile = originalFile
|
|
62
|
+
.resize(resizeOptions);
|
|
63
|
+
}
|
|
64
|
+
if (formatOptions) {
|
|
65
|
+
originalFile = originalFile.toFormat(formatOptions.format, formatOptions.options);
|
|
66
|
+
}
|
|
27
67
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
68
|
+
if ((0, isImage_1.default)(file.mimetype)) {
|
|
69
|
+
dimensions = await (0, getImageSize_1.default)(file);
|
|
70
|
+
fileData.width = dimensions.width;
|
|
71
|
+
fileData.height = dimensions.height;
|
|
31
72
|
}
|
|
32
|
-
if (
|
|
33
|
-
|
|
73
|
+
if (originalFile) {
|
|
74
|
+
fileBuffer = await originalFile.toBuffer({ resolveWithObject: true });
|
|
75
|
+
({ mime, ext } = await (0, file_type_1.fromBuffer)(fileBuffer.data));
|
|
76
|
+
fileData.width = fileBuffer.info.width;
|
|
77
|
+
fileData.height = fileBuffer.info.height;
|
|
78
|
+
fileData.filesize = fileBuffer.data.length;
|
|
34
79
|
}
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
else {
|
|
69
|
-
mime = file.mimetype;
|
|
70
|
-
fileData.filesize = file.size;
|
|
71
|
-
ext = file.name.split('.').pop();
|
|
72
|
-
}
|
|
73
|
-
if (mime === 'application/xml' && ext === 'svg')
|
|
74
|
-
mime = 'image/svg+xml';
|
|
75
|
-
fileData.mimeType = mime;
|
|
76
|
-
const baseFilename = (0, sanitize_filename_1.default)(file.name.substring(0, file.name.lastIndexOf('.')) || file.name);
|
|
77
|
-
fsSafeName = `${baseFilename}.${ext}`;
|
|
78
|
-
if (!overwriteExistingFiles) {
|
|
79
|
-
fsSafeName = await (0, getSafeFilename_1.default)(Model, staticPath, `${baseFilename}.${ext}`);
|
|
80
|
-
}
|
|
81
|
-
fileData.filename = fsSafeName;
|
|
82
|
-
filesToSave.push({
|
|
83
|
-
path: `${staticPath}/${fsSafeName}`,
|
|
84
|
-
buffer: (fileBuffer === null || fileBuffer === void 0 ? void 0 : fileBuffer.data) || file.data,
|
|
85
|
-
});
|
|
86
|
-
if (Array.isArray(imageSizes) && shouldResize) {
|
|
87
|
-
req.payloadUploadSizes = {};
|
|
88
|
-
const { sizeData, sizesToSave } = await (0, imageResizer_1.default)({
|
|
89
|
-
req,
|
|
90
|
-
file: file.data,
|
|
91
|
-
dimensions,
|
|
92
|
-
staticPath,
|
|
93
|
-
config: collectionConfig,
|
|
94
|
-
savedFilename: fsSafeName || file.name,
|
|
95
|
-
mimeType: fileData.mimeType,
|
|
96
|
-
});
|
|
97
|
-
fileData.sizes = sizeData;
|
|
98
|
-
filesToSave.push(...sizesToSave);
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
catch (err) {
|
|
102
|
-
console.error(err);
|
|
103
|
-
throw new errors_1.FileUploadError(req.t);
|
|
104
|
-
}
|
|
105
|
-
newData = {
|
|
106
|
-
...newData,
|
|
107
|
-
...fileData,
|
|
108
|
-
};
|
|
80
|
+
else {
|
|
81
|
+
mime = file.mimetype;
|
|
82
|
+
fileData.filesize = file.size;
|
|
83
|
+
ext = file.name.split('.').pop();
|
|
84
|
+
}
|
|
85
|
+
// Adust SVG mime type. fromBuffer modifies it.
|
|
86
|
+
if (mime === 'application/xml' && ext === 'svg')
|
|
87
|
+
mime = 'image/svg+xml';
|
|
88
|
+
fileData.mimeType = mime;
|
|
89
|
+
const baseFilename = (0, sanitize_filename_1.default)(file.name.substring(0, file.name.lastIndexOf('.')) || file.name);
|
|
90
|
+
fsSafeName = `${baseFilename}.${ext}`;
|
|
91
|
+
if (!overwriteExistingFiles) {
|
|
92
|
+
fsSafeName = await (0, getSafeFilename_1.default)(Model, staticPath, `${baseFilename}.${ext}`);
|
|
93
|
+
}
|
|
94
|
+
fileData.filename = fsSafeName;
|
|
95
|
+
// Original file
|
|
96
|
+
filesToSave.push({
|
|
97
|
+
path: `${staticPath}/${fsSafeName}`,
|
|
98
|
+
buffer: (fileBuffer === null || fileBuffer === void 0 ? void 0 : fileBuffer.data) || file.data,
|
|
99
|
+
});
|
|
100
|
+
if (Array.isArray(imageSizes) && fileSupportsResize) {
|
|
101
|
+
req.payloadUploadSizes = {};
|
|
102
|
+
const { sizeData, sizesToSave } = await (0, imageResizer_1.default)({
|
|
103
|
+
req,
|
|
104
|
+
file,
|
|
105
|
+
dimensions,
|
|
106
|
+
staticPath,
|
|
107
|
+
config: collectionConfig,
|
|
108
|
+
savedFilename: fsSafeName || file.name,
|
|
109
|
+
mimeType: fileData.mimeType,
|
|
110
|
+
});
|
|
111
|
+
fileData.sizes = sizeData;
|
|
112
|
+
filesToSave.push(...sizesToSave);
|
|
109
113
|
}
|
|
110
114
|
}
|
|
115
|
+
catch (err) {
|
|
116
|
+
console.error(err);
|
|
117
|
+
throw new errors_1.FileUploadError(req.t);
|
|
118
|
+
}
|
|
119
|
+
newData = {
|
|
120
|
+
...newData,
|
|
121
|
+
...fileData,
|
|
122
|
+
};
|
|
111
123
|
return {
|
|
112
124
|
data: newData,
|
|
113
125
|
files: filesToSave,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateFileData.js","sourceRoot":"","sources":["../../src/uploads/generateFileData.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAuC;AACvC,oDAA4B;AAC5B,gDAAwB;AACxB,0EAAyC;AACzC,kDAAqC;AAGrC,sCAAyD;AAEzD,
|
|
1
|
+
{"version":3,"file":"generateFileData.js","sourceRoot":"","sources":["../../src/uploads/generateFileData.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,3 @@
|
|
|
1
1
|
import { UploadedFile } from 'express-fileupload';
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
height: number;
|
|
5
|
-
type: string;
|
|
6
|
-
mime: string;
|
|
7
|
-
};
|
|
8
|
-
export default function (image: UploadedFile): Promise<ProbedImageSize>;
|
|
2
|
+
import { ProbedImageSize } from './types';
|
|
3
|
+
export default function (file: UploadedFile): Promise<ProbedImageSize>;
|
|
@@ -3,9 +3,12 @@ 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
|
+
const fs_1 = __importDefault(require("fs"));
|
|
6
7
|
const probe_image_size_1 = __importDefault(require("probe-image-size"));
|
|
7
|
-
async function default_1(
|
|
8
|
-
return
|
|
8
|
+
async function default_1(file) {
|
|
9
|
+
return file.tempFilePath
|
|
10
|
+
? (0, probe_image_size_1.default)(fs_1.default.createReadStream(file.tempFilePath))
|
|
11
|
+
: probe_image_size_1.default.sync(file.data);
|
|
9
12
|
}
|
|
10
13
|
exports.default = default_1;
|
|
11
14
|
//# sourceMappingURL=getImageSize.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getImageSize.js","sourceRoot":"","sources":["../../src/uploads/getImageSize.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"getImageSize.js","sourceRoot":"","sources":["../../src/uploads/getImageSize.ts"],"names":[],"mappings":";;;;;AAAA,4CAAoB;AACpB,wEAA8C;AAI/B,KAAK,oBAAW,IAAkB;IAC/C,OAAO,IAAI,CAAC,YAAY;QACtB,CAAC,CAAC,IAAA,0BAAc,EAAC,YAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACxD,CAAC,CAAC,0BAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACrC,CAAC;AAJD,4BAIC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
import { UploadedFile } from 'express-fileupload';
|
|
2
2
|
import { SanitizedCollectionConfig } from '../collections/config/types';
|
|
3
3
|
import { PayloadRequest } from '../express/types';
|
|
4
4
|
import { FileSizes, FileToSave } from './types';
|
|
@@ -8,7 +8,7 @@ type Dimensions = {
|
|
|
8
8
|
};
|
|
9
9
|
type Args = {
|
|
10
10
|
req: PayloadRequest;
|
|
11
|
-
file:
|
|
11
|
+
file: UploadedFile;
|
|
12
12
|
dimensions: Dimensions;
|
|
13
13
|
staticPath: string;
|
|
14
14
|
config: SanitizedCollectionConfig;
|
|
@@ -22,6 +22,7 @@ async function resizeAndSave({ req, file, dimensions, staticPath, config, savedF
|
|
|
22
22
|
const { imageSizes } = config.upload;
|
|
23
23
|
const sizesToSave = [];
|
|
24
24
|
const sizeData = {};
|
|
25
|
+
const sharpInstance = (0, sharp_1.default)(file.tempFilePath || file.data);
|
|
25
26
|
const promises = imageSizes
|
|
26
27
|
.map(async (desiredSize) => {
|
|
27
28
|
if (!needsResize(desiredSize, dimensions)) {
|
|
@@ -35,7 +36,7 @@ async function resizeAndSave({ req, file, dimensions, staticPath, config, savedF
|
|
|
35
36
|
};
|
|
36
37
|
return;
|
|
37
38
|
}
|
|
38
|
-
let resized =
|
|
39
|
+
let resized = sharpInstance.resize(desiredSize);
|
|
39
40
|
if (desiredSize.formatOptions) {
|
|
40
41
|
resized = resized.toFormat(desiredSize.formatOptions.format, desiredSize.formatOptions.options);
|
|
41
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imageResizer.js","sourceRoot":"","sources":["../../src/uploads/imageResizer.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"imageResizer.js","sourceRoot":"","sources":["../../src/uploads/imageResizer.ts"],"names":[],"mappings":"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"}
|
package/dist/uploads/types.d.ts
CHANGED
|
@@ -19,6 +19,13 @@ export type FileData = {
|
|
|
19
19
|
width: number;
|
|
20
20
|
height: number;
|
|
21
21
|
sizes: FileSizes;
|
|
22
|
+
tempFilePath?: string;
|
|
23
|
+
};
|
|
24
|
+
export type ProbedImageSize = {
|
|
25
|
+
width: number;
|
|
26
|
+
height: number;
|
|
27
|
+
type: string;
|
|
28
|
+
mime: string;
|
|
22
29
|
};
|
|
23
30
|
/**
|
|
24
31
|
* Params sent to the sharp toFormat() function
|
|
@@ -136,7 +136,7 @@ A function that is called immediately following startup that receives the Payloa
|
|
|
136
136
|
|
|
137
137
|
### Test it out
|
|
138
138
|
|
|
139
|
-
After you've gotten this far, it's time to boot up Payload.
|
|
139
|
+
After you've gotten this far, it's time to boot up Payload. Start your project in your application's folder to get going.
|
|
140
140
|
|
|
141
141
|
After it starts, you can go to `http://localhost:3000/admin` to create your first Payload user!
|
|
142
142
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "payload",
|
|
3
|
-
"version": "1.6.
|
|
3
|
+
"version": "1.6.4",
|
|
4
4
|
"description": "Node, React and MongoDB Headless CMS and Application Framework",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"engines": {
|
|
@@ -238,6 +238,7 @@
|
|
|
238
238
|
"@types/pino-std-serializers": "^4.0.0",
|
|
239
239
|
"@types/pluralize": "^0.0.29",
|
|
240
240
|
"@types/prismjs": "^1.26.0",
|
|
241
|
+
"@types/probe-image-size": "^7.2.0",
|
|
241
242
|
"@types/prop-types": "^15.7.5",
|
|
242
243
|
"@types/qs": "^6.9.7",
|
|
243
244
|
"@types/qs-middleware": "^1.0.1",
|