payload 1.6.31 → 1.6.32
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.
|
@@ -46,7 +46,7 @@ const generateFileData = async ({ config, collection: { config: collectionConfig
|
|
|
46
46
|
try {
|
|
47
47
|
const fileSupportsResize = (0, canResizeImage_1.default)(file.mimetype);
|
|
48
48
|
let fsSafeName;
|
|
49
|
-
let
|
|
49
|
+
let sharpFile;
|
|
50
50
|
let dimensions;
|
|
51
51
|
let fileBuffer;
|
|
52
52
|
let ext;
|
|
@@ -54,19 +54,19 @@ const generateFileData = async ({ config, collection: { config: collectionConfig
|
|
|
54
54
|
const sharpOptions = {};
|
|
55
55
|
if (fileIsAnimated)
|
|
56
56
|
sharpOptions.animated = true;
|
|
57
|
-
if (fileSupportsResize) {
|
|
57
|
+
if (fileSupportsResize && (resizeOptions || formatOptions)) {
|
|
58
58
|
if (file.tempFilePath) {
|
|
59
|
-
|
|
59
|
+
sharpFile = (0, sharp_1.default)(file.tempFilePath, sharpOptions);
|
|
60
60
|
}
|
|
61
61
|
else {
|
|
62
|
-
|
|
62
|
+
sharpFile = (0, sharp_1.default)(file.data, sharpOptions);
|
|
63
63
|
}
|
|
64
64
|
if (resizeOptions) {
|
|
65
|
-
|
|
65
|
+
sharpFile = sharpFile
|
|
66
66
|
.resize(resizeOptions);
|
|
67
67
|
}
|
|
68
68
|
if (formatOptions) {
|
|
69
|
-
|
|
69
|
+
sharpFile = sharpFile.toFormat(formatOptions.format, formatOptions.options);
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
if ((0, isImage_1.default)(file.mimetype)) {
|
|
@@ -74,8 +74,8 @@ const generateFileData = async ({ config, collection: { config: collectionConfig
|
|
|
74
74
|
fileData.width = dimensions.width;
|
|
75
75
|
fileData.height = dimensions.height;
|
|
76
76
|
}
|
|
77
|
-
if (
|
|
78
|
-
fileBuffer = await
|
|
77
|
+
if (sharpFile) {
|
|
78
|
+
fileBuffer = await sharpFile.toBuffer({ resolveWithObject: true });
|
|
79
79
|
({ mime, ext } = await (0, file_type_1.fromBuffer)(fileBuffer.data));
|
|
80
80
|
fileData.width = fileBuffer.info.width;
|
|
81
81
|
fileData.height = fileBuffer.info.height;
|
|
@@ -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,kEAA0C;AAC1C,wEAAgD;AAChD,kEAA2C;AAE3C,sEAA8C;AAC9C,wDAAgC;AAgBzB,MAAM,gBAAgB,GAAG,KAAK,EAAK,EACxC,MAAM,EACN,UAAU,EAAE,EACV,MAAM,EAAE,gBAAgB,EACxB,KAAK,GACN,EACD,GAAG,EACH,IAAI,EACJ,kBAAkB,EAClB,sBAAsB,GACd,EAAa,EAAE;IACvB,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE;QAC5B,OAAO;YACL,IAAI;YACJ,KAAK,EAAE,EAAE;SACV,CAAC;KACH;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;IACjC,IAAI,CAAC,IAAI,EAAE;QACT,IAAI,kBAAkB;YAAE,MAAM,IAAI,oBAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAErD,OAAO;YACL,IAAI;YACJ,KAAK,EAAE,EAAE;SACV,CAAC;KACH;IAED,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,mBAAmB,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,gBAAgB,CAAC,MAAM,CAAC;IAE7G,IAAI,UAAU,GAAG,SAAS,CAAC;IAC3B,IAAI,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QAChC,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;KAC9D;IAED,IAAI,CAAC,mBAAmB,EAAE;QACxB,gBAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;KACzB;
|
|
1
|
+
{"version":3,"file":"generateFileData.js","sourceRoot":"","sources":["../../src/uploads/generateFileData.ts"],"names":[],"mappings":"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"}
|