@payloadcms/storage-vercel-blob 4.0.0-internal.cd69eef → 4.0.0-internal.d1cc1d3

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.
@@ -1 +1 @@
1
- {"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAEpB,MAAM,wCAAwC,CAAA;AAU/C,UAAU,2BAA2B;IACnC,MAAM,EAAE,QAAQ,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;IAC1B,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,uBAAuB,CAAC,EACtC,MAAM,EACN,eAAe,EACf,OAAO,EACP,kBAAkB,EAClB,aAAa,EACb,KAAK,EACL,oBAA4B,GAC7B,EAAE,2BAA2B,GAAG,OAAO,CAoGvC"}
1
+ {"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAEpB,MAAM,wCAAwC,CAAA;AAW/C,UAAU,2BAA2B;IACnC,MAAM,EAAE,QAAQ,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;IAC1B,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,uBAAuB,CAAC,EACtC,MAAM,EACN,eAAe,EACf,OAAO,EACP,kBAAkB,EAClB,aAAa,EACb,KAAK,EACL,oBAA4B,GAC7B,EAAE,2BAA2B,GAAG,OAAO,CAwHvC"}
package/dist/adapter.js CHANGED
@@ -1,15 +1,26 @@
1
1
  import { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities';
2
2
  import { generateClientTokenFromReadWriteToken } from '@vercel/blob/client';
3
+ import { Forbidden } from 'payload';
3
4
  import { deleteFile } from './deleteFile.js';
4
5
  import { generateURL } from './generateURL.js';
5
6
  import { getFile } from './getFile.js';
6
7
  import { uploadFile } from './uploadFile.js';
7
8
  export function createVercelBlobAdapter({ access, addRandomSuffix, baseUrl, cacheControlMaxAge, clientUploads, token, useCompositePrefixes = false }) {
9
+ const clientUploadsAccess = typeof clientUploads === 'object' ? clientUploads.access : undefined;
8
10
  return ({ collection, prefix = '' })=>({
9
11
  name: 'vercel-blob',
10
- uploadInstructions: clientUploads ? {
11
- access: typeof clientUploads === 'object' ? clientUploads.access : undefined,
12
- generate: async ({ collectionSlug, docPrefix, filename, filesize, mimeType, req })=>{
12
+ uploadInstructions: {
13
+ adminHandler: {
14
+ path: '@payloadcms/storage-vercel-blob/client#VercelBlobClientUploadHandler'
15
+ },
16
+ enabled: Boolean(clientUploads),
17
+ generate: async ({ collectionSlug, docPrefix, filename, filesize, mimeType, overrideAccess, req })=>{
18
+ if (!overrideAccess && (clientUploadsAccess ? !await clientUploadsAccess({
19
+ collectionSlug,
20
+ req
21
+ }) : !req.user)) {
22
+ throw new Forbidden(req.t);
23
+ }
13
24
  const resolved = await resolveSignedURLKey({
14
25
  collectionPrefix: prefix,
15
26
  collectionSlug,
@@ -28,6 +39,7 @@ export function createVercelBlobAdapter({ access, addRandomSuffix, baseUrl, cach
28
39
  allowedContentTypes: mimeType ? [
29
40
  mimeType
30
41
  ] : undefined,
42
+ allowOverwrite: true,
31
43
  cacheControlMaxAge,
32
44
  maximumSizeInBytes: filesize,
33
45
  pathname: resolved.fileKey,
@@ -35,16 +47,17 @@ export function createVercelBlobAdapter({ access, addRandomSuffix, baseUrl, cach
35
47
  })
36
48
  },
37
49
  file: {
38
- directUpload: {
39
- prefix: resolved.sanitizedDocPrefix
40
- },
41
50
  filename: resolved.sanitizedFilename,
42
51
  mimeType,
43
- size: filesize
52
+ size: filesize,
53
+ uploadReference: {
54
+ prefix: resolved.sanitizedDocPrefix
55
+ }
44
56
  }
45
57
  };
46
- }
47
- } : undefined,
58
+ },
59
+ useInAdmin: true
60
+ },
48
61
  generateURL: ({ filename, prefix: urlPrefix = '' })=>generateURL({
49
62
  baseUrl,
50
63
  collectionPrefix: prefix,
@@ -78,17 +91,17 @@ export function createVercelBlobAdapter({ access, addRandomSuffix, baseUrl, cach
78
91
  }
79
92
  return data;
80
93
  },
81
- staticHandler: (req, { headers, params: { directUpload, filename, prefix: prefixQueryParam } })=>getFile({
94
+ staticHandler: (req, { headers, params: { filename, prefix: prefixQueryParam, uploadReference } })=>getFile({
82
95
  baseUrl,
83
96
  cacheControlMaxAge,
84
97
  collection,
85
98
  collectionPrefix: prefix,
86
- directUpload,
87
99
  filename,
88
100
  incomingHeaders: headers,
89
101
  prefixQueryParam,
90
102
  req,
91
103
  token,
104
+ uploadReference,
92
105
  useCompositePrefixes
93
106
  })
94
107
  });
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type {\n Adapter,\n ClientUploadsConfig,\n GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { generateClientTokenFromReadWriteToken } from '@vercel/blob/client'\n\nimport { deleteFile } from './deleteFile.js'\nimport { generateURL } from './generateURL.js'\nimport { getFile } from './getFile.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateVercelBlobAdapterArgs {\n access: 'public'\n addRandomSuffix?: boolean\n baseUrl: string\n cacheControlMaxAge: number\n clientUploads?: ClientUploadsConfig\n token: string\n useCompositePrefixes?: boolean\n}\n\nexport function createVercelBlobAdapter({\n access,\n addRandomSuffix,\n baseUrl,\n cacheControlMaxAge,\n clientUploads,\n token,\n useCompositePrefixes = false,\n}: CreateVercelBlobAdapterArgs): Adapter {\n return ({ collection, prefix = '' }): GeneratedAdapter => ({\n name: 'vercel-blob',\n\n uploadInstructions: clientUploads\n ? {\n access: typeof clientUploads === 'object' ? clientUploads.access : undefined,\n generate: async ({ collectionSlug, docPrefix, filename, filesize, mimeType, req }) => {\n const resolved = await resolveSignedURLKey({\n collectionPrefix: prefix,\n collectionSlug,\n docPrefix,\n filename,\n req,\n useCompositePrefixes,\n })\n\n return {\n name: 'uploadToVercelBlob',\n type: 'dispatch',\n data: {\n pathname: resolved.fileKey,\n token: await generateClientTokenFromReadWriteToken({\n addRandomSuffix,\n allowedContentTypes: mimeType ? [mimeType] : undefined,\n cacheControlMaxAge,\n maximumSizeInBytes: filesize,\n pathname: resolved.fileKey,\n token,\n }),\n },\n file: {\n directUpload: { prefix: resolved.sanitizedDocPrefix },\n filename: resolved.sanitizedFilename,\n mimeType,\n size: filesize,\n },\n }\n },\n }\n : undefined,\n\n generateURL: ({ filename, prefix: urlPrefix = '' }) =>\n generateURL({\n baseUrl,\n collectionPrefix: prefix,\n filename,\n prefix: urlPrefix,\n useCompositePrefixes,\n }),\n\n handleDelete: ({ doc: { prefix: docPrefix = '' }, filename }) =>\n deleteFile({\n baseUrl,\n collectionPrefix: prefix,\n docPrefix,\n filename,\n token,\n useCompositePrefixes,\n }),\n\n handleUpload: async ({ data, file: { buffer, filename, mimeType } }) => {\n const result = await uploadFile({\n access,\n addRandomSuffix,\n buffer,\n cacheControlMaxAge,\n collectionPrefix: prefix,\n docPrefix: data.prefix,\n filename,\n mimeType,\n token,\n useCompositePrefixes,\n })\n\n if (result.filename) {\n data.filename = result.filename\n }\n\n return data\n },\n\n staticHandler: (\n req,\n { headers, params: { directUpload, filename, prefix: prefixQueryParam } },\n ) =>\n getFile({\n baseUrl,\n cacheControlMaxAge,\n collection,\n collectionPrefix: prefix,\n directUpload,\n filename,\n incomingHeaders: headers,\n prefixQueryParam,\n req,\n token,\n useCompositePrefixes,\n }),\n })\n}\n"],"names":["resolveSignedURLKey","generateClientTokenFromReadWriteToken","deleteFile","generateURL","getFile","uploadFile","createVercelBlobAdapter","access","addRandomSuffix","baseUrl","cacheControlMaxAge","clientUploads","token","useCompositePrefixes","collection","prefix","name","uploadInstructions","undefined","generate","collectionSlug","docPrefix","filename","filesize","mimeType","req","resolved","collectionPrefix","type","data","pathname","fileKey","allowedContentTypes","maximumSizeInBytes","file","directUpload","sanitizedDocPrefix","sanitizedFilename","size","urlPrefix","handleDelete","doc","handleUpload","buffer","result","staticHandler","headers","params","prefixQueryParam","incomingHeaders"],"mappings":"AAMA,SAASA,mBAAmB,QAAQ,6CAA4C;AAChF,SAASC,qCAAqC,QAAQ,sBAAqB;AAE3E,SAASC,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,WAAW,QAAQ,mBAAkB;AAC9C,SAASC,OAAO,QAAQ,eAAc;AACtC,SAASC,UAAU,QAAQ,kBAAiB;AAY5C,OAAO,SAASC,wBAAwB,EACtCC,MAAM,EACNC,eAAe,EACfC,OAAO,EACPC,kBAAkB,EAClBC,aAAa,EACbC,KAAK,EACLC,uBAAuB,KAAK,EACA;IAC5B,OAAO,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE,EAAE,GAAwB,CAAA;YACzDC,MAAM;YAENC,oBAAoBN,gBAChB;gBACEJ,QAAQ,OAAOI,kBAAkB,WAAWA,cAAcJ,MAAM,GAAGW;gBACnEC,UAAU,OAAO,EAAEC,cAAc,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,GAAG,EAAE;oBAC/E,MAAMC,WAAW,MAAM1B,oBAAoB;wBACzC2B,kBAAkBZ;wBAClBK;wBACAC;wBACAC;wBACAG;wBACAZ;oBACF;oBAEA,OAAO;wBACLG,MAAM;wBACNY,MAAM;wBACNC,MAAM;4BACJC,UAAUJ,SAASK,OAAO;4BAC1BnB,OAAO,MAAMX,sCAAsC;gCACjDO;gCACAwB,qBAAqBR,WAAW;oCAACA;iCAAS,GAAGN;gCAC7CR;gCACAuB,oBAAoBV;gCACpBO,UAAUJ,SAASK,OAAO;gCAC1BnB;4BACF;wBACF;wBACAsB,MAAM;4BACJC,cAAc;gCAAEpB,QAAQW,SAASU,kBAAkB;4BAAC;4BACpDd,UAAUI,SAASW,iBAAiB;4BACpCb;4BACAc,MAAMf;wBACR;oBACF;gBACF;YACF,IACAL;YAEJf,aAAa,CAAC,EAAEmB,QAAQ,EAAEP,QAAQwB,YAAY,EAAE,EAAE,GAChDpC,YAAY;oBACVM;oBACAkB,kBAAkBZ;oBAClBO;oBACAP,QAAQwB;oBACR1B;gBACF;YAEF2B,cAAc,CAAC,EAAEC,KAAK,EAAE1B,QAAQM,YAAY,EAAE,EAAE,EAAEC,QAAQ,EAAE,GAC1DpB,WAAW;oBACTO;oBACAkB,kBAAkBZ;oBAClBM;oBACAC;oBACAV;oBACAC;gBACF;YAEF6B,cAAc,OAAO,EAAEb,IAAI,EAAEK,MAAM,EAAES,MAAM,EAAErB,QAAQ,EAAEE,QAAQ,EAAE,EAAE;gBACjE,MAAMoB,SAAS,MAAMvC,WAAW;oBAC9BE;oBACAC;oBACAmC;oBACAjC;oBACAiB,kBAAkBZ;oBAClBM,WAAWQ,KAAKd,MAAM;oBACtBO;oBACAE;oBACAZ;oBACAC;gBACF;gBAEA,IAAI+B,OAAOtB,QAAQ,EAAE;oBACnBO,KAAKP,QAAQ,GAAGsB,OAAOtB,QAAQ;gBACjC;gBAEA,OAAOO;YACT;YAEAgB,eAAe,CACbpB,KACA,EAAEqB,OAAO,EAAEC,QAAQ,EAAEZ,YAAY,EAAEb,QAAQ,EAAEP,QAAQiC,gBAAgB,EAAE,EAAE,GAEzE5C,QAAQ;oBACNK;oBACAC;oBACAI;oBACAa,kBAAkBZ;oBAClBoB;oBACAb;oBACA2B,iBAAiBH;oBACjBE;oBACAvB;oBACAb;oBACAC;gBACF;QACJ,CAAA;AACF"}
1
+ {"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type {\n Adapter,\n ClientUploadsConfig,\n GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { generateClientTokenFromReadWriteToken } from '@vercel/blob/client'\nimport { Forbidden } from 'payload'\n\nimport { deleteFile } from './deleteFile.js'\nimport { generateURL } from './generateURL.js'\nimport { getFile } from './getFile.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateVercelBlobAdapterArgs {\n access: 'public'\n addRandomSuffix?: boolean\n baseUrl: string\n cacheControlMaxAge: number\n clientUploads?: ClientUploadsConfig\n token: string\n useCompositePrefixes?: boolean\n}\n\nexport function createVercelBlobAdapter({\n access,\n addRandomSuffix,\n baseUrl,\n cacheControlMaxAge,\n clientUploads,\n token,\n useCompositePrefixes = false,\n}: CreateVercelBlobAdapterArgs): Adapter {\n const clientUploadsAccess = typeof clientUploads === 'object' ? clientUploads.access : undefined\n\n return ({ collection, prefix = '' }): GeneratedAdapter => ({\n name: 'vercel-blob',\n\n uploadInstructions: {\n adminHandler: {\n path: '@payloadcms/storage-vercel-blob/client#VercelBlobClientUploadHandler',\n },\n enabled: Boolean(clientUploads),\n generate: async ({\n collectionSlug,\n docPrefix,\n filename,\n filesize,\n mimeType,\n overrideAccess,\n req,\n }) => {\n if (\n !overrideAccess &&\n (clientUploadsAccess ? !(await clientUploadsAccess({ collectionSlug, req })) : !req.user)\n ) {\n throw new Forbidden(req.t)\n }\n\n const resolved = await resolveSignedURLKey({\n collectionPrefix: prefix,\n collectionSlug,\n docPrefix,\n filename,\n req,\n useCompositePrefixes,\n })\n\n return {\n name: 'uploadToVercelBlob',\n type: 'dispatch',\n data: {\n pathname: resolved.fileKey,\n token: await generateClientTokenFromReadWriteToken({\n addRandomSuffix,\n allowedContentTypes: mimeType ? [mimeType] : undefined,\n allowOverwrite: true,\n cacheControlMaxAge,\n maximumSizeInBytes: filesize,\n pathname: resolved.fileKey,\n token,\n }),\n },\n file: {\n filename: resolved.sanitizedFilename,\n mimeType,\n size: filesize,\n uploadReference: { prefix: resolved.sanitizedDocPrefix },\n },\n }\n },\n useInAdmin: true,\n },\n\n generateURL: ({ filename, prefix: urlPrefix = '' }) =>\n generateURL({\n baseUrl,\n collectionPrefix: prefix,\n filename,\n prefix: urlPrefix,\n useCompositePrefixes,\n }),\n\n handleDelete: ({ doc: { prefix: docPrefix = '' }, filename }) =>\n deleteFile({\n baseUrl,\n collectionPrefix: prefix,\n docPrefix,\n filename,\n token,\n useCompositePrefixes,\n }),\n\n handleUpload: async ({ data, file: { buffer, filename, mimeType } }) => {\n const result = await uploadFile({\n access,\n addRandomSuffix,\n buffer,\n cacheControlMaxAge,\n collectionPrefix: prefix,\n docPrefix: data.prefix,\n filename,\n mimeType,\n token,\n useCompositePrefixes,\n })\n\n if (result.filename) {\n data.filename = result.filename\n }\n\n return data\n },\n\n staticHandler: (\n req,\n { headers, params: { filename, prefix: prefixQueryParam, uploadReference } },\n ) =>\n getFile({\n baseUrl,\n cacheControlMaxAge,\n collection,\n collectionPrefix: prefix,\n filename,\n incomingHeaders: headers,\n prefixQueryParam,\n req,\n token,\n uploadReference,\n useCompositePrefixes,\n }),\n })\n}\n"],"names":["resolveSignedURLKey","generateClientTokenFromReadWriteToken","Forbidden","deleteFile","generateURL","getFile","uploadFile","createVercelBlobAdapter","access","addRandomSuffix","baseUrl","cacheControlMaxAge","clientUploads","token","useCompositePrefixes","clientUploadsAccess","undefined","collection","prefix","name","uploadInstructions","adminHandler","path","enabled","Boolean","generate","collectionSlug","docPrefix","filename","filesize","mimeType","overrideAccess","req","user","t","resolved","collectionPrefix","type","data","pathname","fileKey","allowedContentTypes","allowOverwrite","maximumSizeInBytes","file","sanitizedFilename","size","uploadReference","sanitizedDocPrefix","useInAdmin","urlPrefix","handleDelete","doc","handleUpload","buffer","result","staticHandler","headers","params","prefixQueryParam","incomingHeaders"],"mappings":"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"}
@@ -1,9 +1,8 @@
1
- export declare const VercelBlobClientUploadHandler: ({ children, collectionSlug, enabled, extra, prefix, serverHandlerPath, }: {
1
+ export declare const VercelBlobClientUploadHandler: ({ children, collectionSlug, endpointPath, prefix, props, }: {
2
2
  children: import("react").ReactNode;
3
3
  collectionSlug: import("payload").UploadCollectionSlug;
4
- enabled?: boolean;
5
- extra: Record<string, unknown>;
4
+ endpointPath?: `/${string}`;
6
5
  prefix?: string;
7
- serverHandlerPath: `/${string}`;
6
+ props: Record<string, unknown>;
8
7
  }) => import("react").JSX.Element;
9
8
  //# sourceMappingURL=VercelBlobClientUploadHandler.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"VercelBlobClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/VercelBlobClientUploadHandler.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,6BAA6B;;;;;;;iCAgBxC,CAAA"}
1
+ {"version":3,"file":"VercelBlobClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/VercelBlobClientUploadHandler.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,6BAA6B;;;;;;iCAgBxC,CAAA"}
package/dist/getFile.d.ts CHANGED
@@ -4,14 +4,14 @@ interface GetFileArgs {
4
4
  cacheControlMaxAge: number;
5
5
  collection: CollectionConfig;
6
6
  collectionPrefix?: string;
7
- directUpload?: unknown;
8
7
  filename: string;
9
8
  incomingHeaders?: Headers;
10
9
  prefixQueryParam?: string;
11
10
  req: PayloadRequest;
12
11
  token: string;
12
+ uploadReference?: unknown;
13
13
  useCompositePrefixes?: boolean;
14
14
  }
15
- export declare function getFile({ baseUrl, cacheControlMaxAge, collection, collectionPrefix, directUpload, filename, incomingHeaders, prefixQueryParam, req, token, useCompositePrefixes, }: GetFileArgs): Promise<Response>;
15
+ export declare function getFile({ baseUrl, cacheControlMaxAge, collection, collectionPrefix, filename, incomingHeaders, prefixQueryParam, req, token, uploadReference, useCompositePrefixes, }: GetFileArgs): Promise<Response>;
16
16
  export {};
17
17
  //# sourceMappingURL=getFile.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAQ/D,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;IAC1B,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAsB,OAAO,CAAC,EAC5B,OAAO,EACP,kBAAkB,EAClB,UAAU,EACV,gBAAqB,EACrB,YAAY,EACZ,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,GAAG,EACH,KAAK,EACL,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CA8FjC"}
1
+ {"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAQ/D,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;IAC1B,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAsB,OAAO,CAAC,EAC5B,OAAO,EACP,kBAAkB,EAClB,UAAU,EACV,gBAAqB,EACrB,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,GAAG,EACH,KAAK,EACL,eAAe,EACf,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CA8FjC"}
package/dist/getFile.js CHANGED
@@ -2,14 +2,14 @@ import { getFilePrefix as getDocPrefix } from '@payloadcms/plugin-cloud-storage/
2
2
  import { BlobNotFoundError, head } from '@vercel/blob';
3
3
  import { getRangeRequestInfo } from 'payload/internal';
4
4
  import { generateURL } from './generateURL.js';
5
- export async function getFile({ baseUrl, cacheControlMaxAge, collection, collectionPrefix = '', directUpload, filename, incomingHeaders, prefixQueryParam, req, token, useCompositePrefixes = false }) {
5
+ export async function getFile({ baseUrl, cacheControlMaxAge, collection, collectionPrefix = '', filename, incomingHeaders, prefixQueryParam, req, token, uploadReference, useCompositePrefixes = false }) {
6
6
  try {
7
7
  const docPrefix = await getDocPrefix({
8
8
  collection,
9
- directUpload,
10
9
  filename,
11
10
  prefixQueryParam,
12
- req
11
+ req,
12
+ uploadReference
13
13
  });
14
14
  const fileUrl = generateURL({
15
15
  baseUrl,
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { CollectionConfig, PayloadRequest } from 'payload'\n\nimport { getFilePrefix as getDocPrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { BlobNotFoundError, head } from '@vercel/blob'\nimport { getRangeRequestInfo } from 'payload/internal'\n\nimport { generateURL } from './generateURL.js'\n\ninterface GetFileArgs {\n baseUrl: string\n cacheControlMaxAge: number\n collection: CollectionConfig\n collectionPrefix?: string\n directUpload?: unknown\n filename: string\n incomingHeaders?: Headers\n prefixQueryParam?: string\n req: PayloadRequest\n token: string\n useCompositePrefixes?: boolean\n}\n\nexport async function getFile({\n baseUrl,\n cacheControlMaxAge,\n collection,\n collectionPrefix = '',\n directUpload,\n filename,\n incomingHeaders,\n prefixQueryParam,\n req,\n token,\n useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n try {\n const docPrefix = await getDocPrefix({\n collection,\n directUpload,\n filename,\n prefixQueryParam,\n req,\n })\n\n const fileUrl = generateURL({\n baseUrl,\n collectionPrefix,\n filename,\n prefix: docPrefix,\n useCompositePrefixes,\n })\n const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n const blobMetadata = await head(fileUrl, { token })\n const { contentDisposition, contentType, size, uploadedAt } = blobMetadata\n const uploadedAtString = uploadedAt.toISOString()\n const fileKeyForETag = fileUrl.replace(`${baseUrl}/`, '')\n const ETag = `\"${fileKeyForETag}-${uploadedAtString}\"`\n\n // Handle range request\n const rangeHeader = req.headers.get('range')\n const rangeResult = getRangeRequestInfo({ fileSize: size, rangeHeader })\n\n if (rangeResult.type === 'invalid') {\n return new Response(null, {\n headers: new Headers(rangeResult.headers),\n status: rangeResult.status,\n })\n }\n\n let headers = new Headers(incomingHeaders)\n\n // Add range-related headers from the result\n for (const [key, value] of Object.entries(rangeResult.headers)) {\n headers.append(key, value)\n }\n\n headers.append('Cache-Control', `public, max-age=${cacheControlMaxAge}`)\n headers.append('Content-Disposition', contentDisposition)\n headers.append('Content-Type', contentType)\n headers.append('ETag', ETag)\n\n // Add Content-Security-Policy header for SVG files to prevent executable code\n if (contentType === 'image/svg+xml') {\n headers.append('Content-Security-Policy', \"script-src 'none'\")\n }\n\n if (\n collection.upload &&\n typeof collection.upload === 'object' &&\n typeof collection.upload.modifyResponseHeaders === 'function'\n ) {\n headers = collection.upload.modifyResponseHeaders({ headers }) || headers\n }\n\n if (etagFromHeaders && etagFromHeaders === ETag) {\n return new Response(null, {\n headers,\n status: 304,\n })\n }\n\n const response = await fetch(`${fileUrl}?${uploadedAtString}`, {\n headers: {\n 'Cache-Control': 'no-store, no-cache, must-revalidate',\n Pragma: 'no-cache',\n ...(rangeResult.type === 'partial' && {\n Range: `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}`,\n }),\n },\n })\n\n if (!response.ok || !response.body) {\n return new Response(null, { status: 204, statusText: 'No Content' })\n }\n\n headers.append('Last-Modified', uploadedAtString)\n\n return new Response(response.body, {\n headers,\n status: rangeResult.status,\n })\n } catch (err: unknown) {\n if (err instanceof BlobNotFoundError) {\n return new Response(null, { status: 404, statusText: 'Not Found' })\n }\n req.payload.logger.error({ err, msg: 'Unexpected error in staticHandler' })\n return new Response('Internal Server Error', { status: 500 })\n }\n}\n"],"names":["getFilePrefix","getDocPrefix","BlobNotFoundError","head","getRangeRequestInfo","generateURL","getFile","baseUrl","cacheControlMaxAge","collection","collectionPrefix","directUpload","filename","incomingHeaders","prefixQueryParam","req","token","useCompositePrefixes","docPrefix","fileUrl","prefix","etagFromHeaders","headers","get","blobMetadata","contentDisposition","contentType","size","uploadedAt","uploadedAtString","toISOString","fileKeyForETag","replace","ETag","rangeHeader","rangeResult","fileSize","type","Response","Headers","status","key","value","Object","entries","append","upload","modifyResponseHeaders","response","fetch","Pragma","Range","rangeStart","rangeEnd","ok","body","statusText","err","payload","logger","error","msg"],"mappings":"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"}
1
+ {"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { CollectionConfig, PayloadRequest } from 'payload'\n\nimport { getFilePrefix as getDocPrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { BlobNotFoundError, head } from '@vercel/blob'\nimport { getRangeRequestInfo } from 'payload/internal'\n\nimport { generateURL } from './generateURL.js'\n\ninterface GetFileArgs {\n baseUrl: string\n cacheControlMaxAge: number\n collection: CollectionConfig\n collectionPrefix?: string\n filename: string\n incomingHeaders?: Headers\n prefixQueryParam?: string\n req: PayloadRequest\n token: string\n uploadReference?: unknown\n useCompositePrefixes?: boolean\n}\n\nexport async function getFile({\n baseUrl,\n cacheControlMaxAge,\n collection,\n collectionPrefix = '',\n filename,\n incomingHeaders,\n prefixQueryParam,\n req,\n token,\n uploadReference,\n useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n try {\n const docPrefix = await getDocPrefix({\n collection,\n filename,\n prefixQueryParam,\n req,\n uploadReference,\n })\n\n const fileUrl = generateURL({\n baseUrl,\n collectionPrefix,\n filename,\n prefix: docPrefix,\n useCompositePrefixes,\n })\n const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n const blobMetadata = await head(fileUrl, { token })\n const { contentDisposition, contentType, size, uploadedAt } = blobMetadata\n const uploadedAtString = uploadedAt.toISOString()\n const fileKeyForETag = fileUrl.replace(`${baseUrl}/`, '')\n const ETag = `\"${fileKeyForETag}-${uploadedAtString}\"`\n\n // Handle range request\n const rangeHeader = req.headers.get('range')\n const rangeResult = getRangeRequestInfo({ fileSize: size, rangeHeader })\n\n if (rangeResult.type === 'invalid') {\n return new Response(null, {\n headers: new Headers(rangeResult.headers),\n status: rangeResult.status,\n })\n }\n\n let headers = new Headers(incomingHeaders)\n\n // Add range-related headers from the result\n for (const [key, value] of Object.entries(rangeResult.headers)) {\n headers.append(key, value)\n }\n\n headers.append('Cache-Control', `public, max-age=${cacheControlMaxAge}`)\n headers.append('Content-Disposition', contentDisposition)\n headers.append('Content-Type', contentType)\n headers.append('ETag', ETag)\n\n // Add Content-Security-Policy header for SVG files to prevent executable code\n if (contentType === 'image/svg+xml') {\n headers.append('Content-Security-Policy', \"script-src 'none'\")\n }\n\n if (\n collection.upload &&\n typeof collection.upload === 'object' &&\n typeof collection.upload.modifyResponseHeaders === 'function'\n ) {\n headers = collection.upload.modifyResponseHeaders({ headers }) || headers\n }\n\n if (etagFromHeaders && etagFromHeaders === ETag) {\n return new Response(null, {\n headers,\n status: 304,\n })\n }\n\n const response = await fetch(`${fileUrl}?${uploadedAtString}`, {\n headers: {\n 'Cache-Control': 'no-store, no-cache, must-revalidate',\n Pragma: 'no-cache',\n ...(rangeResult.type === 'partial' && {\n Range: `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}`,\n }),\n },\n })\n\n if (!response.ok || !response.body) {\n return new Response(null, { status: 204, statusText: 'No Content' })\n }\n\n headers.append('Last-Modified', uploadedAtString)\n\n return new Response(response.body, {\n headers,\n status: rangeResult.status,\n })\n } catch (err: unknown) {\n if (err instanceof BlobNotFoundError) {\n return new Response(null, { status: 404, statusText: 'Not Found' })\n }\n req.payload.logger.error({ err, msg: 'Unexpected error in staticHandler' })\n return new Response('Internal Server Error', { status: 500 })\n }\n}\n"],"names":["getFilePrefix","getDocPrefix","BlobNotFoundError","head","getRangeRequestInfo","generateURL","getFile","baseUrl","cacheControlMaxAge","collection","collectionPrefix","filename","incomingHeaders","prefixQueryParam","req","token","uploadReference","useCompositePrefixes","docPrefix","fileUrl","prefix","etagFromHeaders","headers","get","blobMetadata","contentDisposition","contentType","size","uploadedAt","uploadedAtString","toISOString","fileKeyForETag","replace","ETag","rangeHeader","rangeResult","fileSize","type","Response","Headers","status","key","value","Object","entries","append","upload","modifyResponseHeaders","response","fetch","Pragma","Range","rangeStart","rangeEnd","ok","body","statusText","err","payload","logger","error","msg"],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,cAAc,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAO3E,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IAEzB;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAE3B;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IAEnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IAE7F;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAEzB;;;;;;;;;;;;OAYG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AASD,KAAK,wBAAwB,GAAG,CAAC,qBAAqB,EAAE,wBAAwB,KAAK,cAAc,CAAA;AAEnG,eAAO,MAAM,iBAAiB,EAAE,wBA4G9B,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,cAAc,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAM3E,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IAEzB;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAE3B;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IAEnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IAE7F;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAEzB;;;;;;;;;;;;OAYG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AASD,KAAK,wBAAwB,GAAG,CAAC,qBAAqB,EAAE,wBAAwB,KAAK,cAAc,CAAA;AAEnG,eAAO,MAAM,iBAAiB,EAAE,wBAoG9B,CAAA"}
package/dist/index.js CHANGED
@@ -1,5 +1,4 @@
1
1
  import { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage';
2
- import { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities';
3
2
  import { createVercelBlobAdapter } from './adapter.js';
4
3
  const defaultUploadOptions = {
5
4
  access: 'public',
@@ -24,13 +23,6 @@ export const vercelBlobStorage = (options)=>({
24
23
  };
25
24
  // support overriding the base URL for emulator https://github.com/payloadcms/vercel-blob-emulator
26
25
  const baseUrl = process.env.STORAGE_VERCEL_BLOB_BASE_URL || `https://${storeId}.${optionsWithDefaults.access}.blob.vercel-storage.com`;
27
- initClientUploads({
28
- clientHandler: '@payloadcms/storage-vercel-blob/client#VercelBlobClientUploadHandler',
29
- collections: options.collections,
30
- config: incomingConfig,
31
- enabled: !isPluginDisabled && Boolean(options.clientUploads),
32
- serverHandlerPath: '/upload-instructions'
33
- });
34
26
  // If the plugin is disabled or no token is provided, do not enable the plugin
35
27
  if (isPluginDisabled) {
36
28
  if (options.alwaysInsertFields) {
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n ClientUploadsConfig,\n PluginOptions as CloudStoragePluginOptions,\n CollectionOptions,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, StorageAdapter, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'\n\nimport { createVercelBlobAdapter } from './adapter.js'\n\nexport type VercelBlobStorageOptions = {\n /**\n * Access control level. Currently, only 'public' is supported.\n * Vercel plans on adding support for private blobs in the future.\n *\n * @default 'public'\n */\n access?: 'public'\n\n /**\n * Add a random suffix to the uploaded file name in Vercel Blob storage\n *\n * @default false\n */\n addRandomSuffix?: boolean\n\n /**\n * When enabled, fields (like the prefix field) will always be inserted into\n * the collection schema regardless of whether the plugin is enabled. This\n * ensures a consistent schema across all environments.\n *\n * This will be enabled by default in Payload v4.\n *\n * @default false\n */\n alwaysInsertFields?: boolean\n\n /**\n * Cache-Control max-age in seconds\n *\n * @default 365 * 24 * 60 * 60 // (1 Year)\n */\n cacheControlMaxAge?: number\n\n /**\n * Upload directly to Vercel Blob instead of through Payload.\n */\n clientUploads?: ClientUploadsConfig\n\n /**\n * Collections to apply the Vercel Blob adapter to\n */\n collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>\n\n /**\n * Whether or not to enable the plugin\n *\n * Default: true\n */\n enabled?: boolean\n /**\n * Vercel Blob storage read/write token\n *\n * Usually process.env.BLOB_READ_WRITE_TOKEN set by Vercel\n *\n * If unset, the plugin will be disabled and will fallback to local storage\n */\n token: string | undefined\n\n /**\n * When true, the collection-level prefix and document-level prefix are combined\n * (compositional). When false (default), document prefix overrides collection\n * prefix entirely.\n *\n * Example:\n * - collection prefix: `collection-prefix/`\n * - document prefix: `document-prefix/`\n * - resulting prefix with useCompositePrefixes=true: `collection-prefix/document-prefix/`\n * - resulting prefix with useCompositePrefixes=false: `document-prefix/`\n *\n * @default false\n */\n useCompositePrefixes?: boolean\n}\n\nconst defaultUploadOptions: Partial<VercelBlobStorageOptions> = {\n access: 'public',\n addRandomSuffix: false,\n cacheControlMaxAge: 60 * 60 * 24 * 365, // 1 year\n enabled: true,\n}\n\ntype VercelBlobStorageFactory = (vercelBlobStorageOpts: VercelBlobStorageOptions) => StorageAdapter\n\nexport const vercelBlobStorage: VercelBlobStorageFactory = (\n options: VercelBlobStorageOptions,\n): StorageAdapter => ({\n name: 'vercel-blob',\n collections: Object.keys(options.collections),\n init: (incomingConfig: Config): Config => {\n // Parse storeId from token\n const storeId = options.token\n ?.match(/^vercel_blob_rw_([a-z\\d]+)_[a-z\\d]+$/i)?.[1]\n ?.toLowerCase()\n\n const isPluginDisabled = options.enabled === false || !options.token\n\n // Don't throw if the plugin is disabled\n if (!storeId && !isPluginDisabled) {\n throw new Error(\n 'Invalid token format for Vercel Blob adapter. Should be vercel_blob_rw_<store_id>_<random_string>.',\n )\n }\n\n const optionsWithDefaults = {\n ...defaultUploadOptions,\n ...options,\n }\n\n // support overriding the base URL for emulator https://github.com/payloadcms/vercel-blob-emulator\n const baseUrl =\n process.env.STORAGE_VERCEL_BLOB_BASE_URL ||\n `https://${storeId}.${optionsWithDefaults.access}.blob.vercel-storage.com`\n\n initClientUploads({\n clientHandler: '@payloadcms/storage-vercel-blob/client#VercelBlobClientUploadHandler',\n collections: options.collections,\n config: incomingConfig,\n enabled: !isPluginDisabled && Boolean(options.clientUploads),\n serverHandlerPath: '/upload-instructions',\n })\n\n // If the plugin is disabled or no token is provided, do not enable the plugin\n if (isPluginDisabled) {\n if (options.alwaysInsertFields) {\n const collectionsWithoutAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n options.collections,\n ).reduce(\n (acc, [slug, collOptions]) => ({\n ...acc,\n [slug]: { ...(collOptions === true ? {} : collOptions), adapter: null },\n }),\n {} as Record<string, CollectionOptions>,\n )\n return cloudStoragePlugin({\n alwaysInsertFields: true,\n collections: collectionsWithoutAdapter,\n enabled: false,\n useCompositePrefixes: options.useCompositePrefixes,\n })(incomingConfig)\n }\n return incomingConfig\n }\n\n const adapter = createVercelBlobAdapter({\n access: optionsWithDefaults.access ?? 'public',\n addRandomSuffix: optionsWithDefaults.addRandomSuffix,\n baseUrl,\n cacheControlMaxAge: optionsWithDefaults.cacheControlMaxAge ?? 60 * 60 * 24 * 365,\n clientUploads: optionsWithDefaults.clientUploads,\n token: options.token!,\n useCompositePrefixes: options.useCompositePrefixes,\n })\n\n // Add adapter to each collection option object\n const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n options.collections,\n ).reduce(\n (acc, [slug, collOptions]) => ({\n ...acc,\n [slug]: {\n ...(collOptions === true ? {} : collOptions),\n adapter,\n },\n }),\n {} as Record<string, CollectionOptions>,\n )\n\n // Set disableLocalStorage: true for collections specified in the plugin options\n const config = {\n ...incomingConfig,\n collections: (incomingConfig.collections || []).map((collection) => {\n if (!collectionsWithAdapter[collection.slug]) {\n return collection\n }\n\n return {\n ...collection,\n upload: {\n ...(typeof collection.upload === 'object' ? collection.upload : {}),\n disableLocalStorage: true,\n },\n }\n }),\n }\n\n return cloudStoragePlugin({\n alwaysInsertFields: options.alwaysInsertFields,\n collections: collectionsWithAdapter,\n useCompositePrefixes: options.useCompositePrefixes,\n })(config)\n },\n})\n"],"names":["cloudStoragePlugin","initClientUploads","createVercelBlobAdapter","defaultUploadOptions","access","addRandomSuffix","cacheControlMaxAge","enabled","vercelBlobStorage","options","name","collections","Object","keys","init","incomingConfig","storeId","token","match","toLowerCase","isPluginDisabled","Error","optionsWithDefaults","baseUrl","process","env","STORAGE_VERCEL_BLOB_BASE_URL","clientHandler","config","Boolean","clientUploads","serverHandlerPath","alwaysInsertFields","collectionsWithoutAdapter","entries","reduce","acc","slug","collOptions","adapter","useCompositePrefixes","collectionsWithAdapter","map","collection","upload","disableLocalStorage"],"mappings":"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"}
1
+ {"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n ClientUploadsConfig,\n PluginOptions as CloudStoragePluginOptions,\n CollectionOptions,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, StorageAdapter, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\n\nimport { createVercelBlobAdapter } from './adapter.js'\n\nexport type VercelBlobStorageOptions = {\n /**\n * Access control level. Currently, only 'public' is supported.\n * Vercel plans on adding support for private blobs in the future.\n *\n * @default 'public'\n */\n access?: 'public'\n\n /**\n * Add a random suffix to the uploaded file name in Vercel Blob storage\n *\n * @default false\n */\n addRandomSuffix?: boolean\n\n /**\n * When enabled, fields (like the prefix field) will always be inserted into\n * the collection schema regardless of whether the plugin is enabled. This\n * ensures a consistent schema across all environments.\n *\n * This will be enabled by default in Payload v4.\n *\n * @default false\n */\n alwaysInsertFields?: boolean\n\n /**\n * Cache-Control max-age in seconds\n *\n * @default 365 * 24 * 60 * 60 // (1 Year)\n */\n cacheControlMaxAge?: number\n\n /**\n * Upload directly to Vercel Blob instead of through Payload.\n */\n clientUploads?: ClientUploadsConfig\n\n /**\n * Collections to apply the Vercel Blob adapter to\n */\n collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>\n\n /**\n * Whether or not to enable the plugin\n *\n * Default: true\n */\n enabled?: boolean\n /**\n * Vercel Blob storage read/write token\n *\n * Usually process.env.BLOB_READ_WRITE_TOKEN set by Vercel\n *\n * If unset, the plugin will be disabled and will fallback to local storage\n */\n token: string | undefined\n\n /**\n * When true, the collection-level prefix and document-level prefix are combined\n * (compositional). When false (default), document prefix overrides collection\n * prefix entirely.\n *\n * Example:\n * - collection prefix: `collection-prefix/`\n * - document prefix: `document-prefix/`\n * - resulting prefix with useCompositePrefixes=true: `collection-prefix/document-prefix/`\n * - resulting prefix with useCompositePrefixes=false: `document-prefix/`\n *\n * @default false\n */\n useCompositePrefixes?: boolean\n}\n\nconst defaultUploadOptions: Partial<VercelBlobStorageOptions> = {\n access: 'public',\n addRandomSuffix: false,\n cacheControlMaxAge: 60 * 60 * 24 * 365, // 1 year\n enabled: true,\n}\n\ntype VercelBlobStorageFactory = (vercelBlobStorageOpts: VercelBlobStorageOptions) => StorageAdapter\n\nexport const vercelBlobStorage: VercelBlobStorageFactory = (\n options: VercelBlobStorageOptions,\n): StorageAdapter => ({\n name: 'vercel-blob',\n collections: Object.keys(options.collections),\n init: (incomingConfig: Config): Config => {\n // Parse storeId from token\n const storeId = options.token\n ?.match(/^vercel_blob_rw_([a-z\\d]+)_[a-z\\d]+$/i)?.[1]\n ?.toLowerCase()\n\n const isPluginDisabled = options.enabled === false || !options.token\n\n // Don't throw if the plugin is disabled\n if (!storeId && !isPluginDisabled) {\n throw new Error(\n 'Invalid token format for Vercel Blob adapter. Should be vercel_blob_rw_<store_id>_<random_string>.',\n )\n }\n\n const optionsWithDefaults = {\n ...defaultUploadOptions,\n ...options,\n }\n\n // support overriding the base URL for emulator https://github.com/payloadcms/vercel-blob-emulator\n const baseUrl =\n process.env.STORAGE_VERCEL_BLOB_BASE_URL ||\n `https://${storeId}.${optionsWithDefaults.access}.blob.vercel-storage.com`\n\n // If the plugin is disabled or no token is provided, do not enable the plugin\n if (isPluginDisabled) {\n if (options.alwaysInsertFields) {\n const collectionsWithoutAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n options.collections,\n ).reduce(\n (acc, [slug, collOptions]) => ({\n ...acc,\n [slug]: { ...(collOptions === true ? {} : collOptions), adapter: null },\n }),\n {} as Record<string, CollectionOptions>,\n )\n return cloudStoragePlugin({\n alwaysInsertFields: true,\n collections: collectionsWithoutAdapter,\n enabled: false,\n useCompositePrefixes: options.useCompositePrefixes,\n })(incomingConfig)\n }\n return incomingConfig\n }\n\n const adapter = createVercelBlobAdapter({\n access: optionsWithDefaults.access ?? 'public',\n addRandomSuffix: optionsWithDefaults.addRandomSuffix,\n baseUrl,\n cacheControlMaxAge: optionsWithDefaults.cacheControlMaxAge ?? 60 * 60 * 24 * 365,\n clientUploads: optionsWithDefaults.clientUploads,\n token: options.token!,\n useCompositePrefixes: options.useCompositePrefixes,\n })\n\n // Add adapter to each collection option object\n const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n options.collections,\n ).reduce(\n (acc, [slug, collOptions]) => ({\n ...acc,\n [slug]: {\n ...(collOptions === true ? {} : collOptions),\n adapter,\n },\n }),\n {} as Record<string, CollectionOptions>,\n )\n\n // Set disableLocalStorage: true for collections specified in the plugin options\n const config = {\n ...incomingConfig,\n collections: (incomingConfig.collections || []).map((collection) => {\n if (!collectionsWithAdapter[collection.slug]) {\n return collection\n }\n\n return {\n ...collection,\n upload: {\n ...(typeof collection.upload === 'object' ? collection.upload : {}),\n disableLocalStorage: true,\n },\n }\n }),\n }\n\n return cloudStoragePlugin({\n alwaysInsertFields: options.alwaysInsertFields,\n collections: collectionsWithAdapter,\n useCompositePrefixes: options.useCompositePrefixes,\n })(config)\n },\n})\n"],"names":["cloudStoragePlugin","createVercelBlobAdapter","defaultUploadOptions","access","addRandomSuffix","cacheControlMaxAge","enabled","vercelBlobStorage","options","name","collections","Object","keys","init","incomingConfig","storeId","token","match","toLowerCase","isPluginDisabled","Error","optionsWithDefaults","baseUrl","process","env","STORAGE_VERCEL_BLOB_BASE_URL","alwaysInsertFields","collectionsWithoutAdapter","entries","reduce","acc","slug","collOptions","adapter","useCompositePrefixes","clientUploads","collectionsWithAdapter","config","map","collection","upload","disableLocalStorage"],"mappings":"AAOA,SAASA,kBAAkB,QAAQ,mCAAkC;AAErE,SAASC,uBAAuB,QAAQ,eAAc;AA6EtD,MAAMC,uBAA0D;IAC9DC,QAAQ;IACRC,iBAAiB;IACjBC,oBAAoB,KAAK,KAAK,KAAK;IACnCC,SAAS;AACX;AAIA,OAAO,MAAMC,oBAA8C,CACzDC,UACoB,CAAA;QACpBC,MAAM;QACNC,aAAaC,OAAOC,IAAI,CAACJ,QAAQE,WAAW;QAC5CG,MAAM,CAACC;YACL,2BAA2B;YAC3B,MAAMC,UAAUP,QAAQQ,KAAK,EACzBC,MAAM,0CAA0C,CAAC,EAAE,EACnDC;YAEJ,MAAMC,mBAAmBX,QAAQF,OAAO,KAAK,SAAS,CAACE,QAAQQ,KAAK;YAEpE,wCAAwC;YACxC,IAAI,CAACD,WAAW,CAACI,kBAAkB;gBACjC,MAAM,IAAIC,MACR;YAEJ;YAEA,MAAMC,sBAAsB;gBAC1B,GAAGnB,oBAAoB;gBACvB,GAAGM,OAAO;YACZ;YAEA,kGAAkG;YAClG,MAAMc,UACJC,QAAQC,GAAG,CAACC,4BAA4B,IACxC,CAAC,QAAQ,EAAEV,QAAQ,CAAC,EAAEM,oBAAoBlB,MAAM,CAAC,wBAAwB,CAAC;YAE5E,8EAA8E;YAC9E,IAAIgB,kBAAkB;gBACpB,IAAIX,QAAQkB,kBAAkB,EAAE;oBAC9B,MAAMC,4BAAsEhB,OAAOiB,OAAO,CACxFpB,QAAQE,WAAW,EACnBmB,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;4BAC7B,GAAGF,GAAG;4BACN,CAACC,KAAK,EAAE;gCAAE,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;gCAAGC,SAAS;4BAAK;wBACxE,CAAA,GACA,CAAC;oBAEH,OAAOjC,mBAAmB;wBACxB0B,oBAAoB;wBACpBhB,aAAaiB;wBACbrB,SAAS;wBACT4B,sBAAsB1B,QAAQ0B,oBAAoB;oBACpD,GAAGpB;gBACL;gBACA,OAAOA;YACT;YAEA,MAAMmB,UAAUhC,wBAAwB;gBACtCE,QAAQkB,oBAAoBlB,MAAM,IAAI;gBACtCC,iBAAiBiB,oBAAoBjB,eAAe;gBACpDkB;gBACAjB,oBAAoBgB,oBAAoBhB,kBAAkB,IAAI,KAAK,KAAK,KAAK;gBAC7E8B,eAAed,oBAAoBc,aAAa;gBAChDnB,OAAOR,QAAQQ,KAAK;gBACpBkB,sBAAsB1B,QAAQ0B,oBAAoB;YACpD;YAEA,+CAA+C;YAC/C,MAAME,yBAAmEzB,OAAOiB,OAAO,CACrFpB,QAAQE,WAAW,EACnBmB,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;oBAC7B,GAAGF,GAAG;oBACN,CAACC,KAAK,EAAE;wBACN,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;wBAC3CC;oBACF;gBACF,CAAA,GACA,CAAC;YAGH,gFAAgF;YAChF,MAAMI,SAAS;gBACb,GAAGvB,cAAc;gBACjBJ,aAAa,AAACI,CAAAA,eAAeJ,WAAW,IAAI,EAAE,AAAD,EAAG4B,GAAG,CAAC,CAACC;oBACnD,IAAI,CAACH,sBAAsB,CAACG,WAAWR,IAAI,CAAC,EAAE;wBAC5C,OAAOQ;oBACT;oBAEA,OAAO;wBACL,GAAGA,UAAU;wBACbC,QAAQ;4BACN,GAAI,OAAOD,WAAWC,MAAM,KAAK,WAAWD,WAAWC,MAAM,GAAG,CAAC,CAAC;4BAClEC,qBAAqB;wBACvB;oBACF;gBACF;YACF;YAEA,OAAOzC,mBAAmB;gBACxB0B,oBAAoBlB,QAAQkB,kBAAkB;gBAC9ChB,aAAa0B;gBACbF,sBAAsB1B,QAAQ0B,oBAAoB;YACpD,GAAGG;QACL;IACF,CAAA,EAAE"}
@@ -1 +1 @@
1
- {"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../src/uploadFile.ts"],"names":[],"mappings":"AAIA,UAAU,cAAc;IACtB,MAAM,EAAE,QAAQ,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,wBAAsB,UAAU,CAAC,EAC/B,MAAM,EACN,eAAe,EACf,MAAM,EACN,kBAAkB,EAClB,gBAAqB,EACrB,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,oBAA4B,GAC7B,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAuB5C"}
1
+ {"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../src/uploadFile.ts"],"names":[],"mappings":"AAIA,UAAU,cAAc;IACtB,MAAM,EAAE,QAAQ,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,wBAAsB,UAAU,CAAC,EAC/B,MAAM,EACN,eAAe,EACf,MAAM,EACN,kBAAkB,EAClB,gBAAqB,EACrB,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,oBAA4B,GAC7B,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwB5C"}
@@ -11,6 +11,7 @@ export async function uploadFile({ access, addRandomSuffix, buffer, cacheControl
11
11
  const result = await put(fileKey, buffer, {
12
12
  access,
13
13
  addRandomSuffix,
14
+ allowOverwrite: true,
14
15
  cacheControlMaxAge,
15
16
  contentType: mimeType,
16
17
  token
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/uploadFile.ts"],"sourcesContent":["import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { put } from '@vercel/blob'\nimport path from 'path'\n\ninterface UploadFileArgs {\n access: 'public'\n addRandomSuffix?: boolean\n buffer: Buffer\n cacheControlMaxAge?: number\n collectionPrefix?: string\n docPrefix?: string\n filename: string\n mimeType: string\n token: string\n useCompositePrefixes?: boolean\n}\n\ninterface UploadFileResult {\n filename?: string\n}\n\nexport async function uploadFile({\n access,\n addRandomSuffix,\n buffer,\n cacheControlMaxAge,\n collectionPrefix = '',\n docPrefix,\n filename,\n mimeType,\n token,\n useCompositePrefixes = false,\n}: UploadFileArgs): Promise<UploadFileResult> {\n const { fileKey } = getFileKey({\n collectionPrefix,\n docPrefix,\n filename,\n useCompositePrefixes,\n })\n\n const result = await put(fileKey, buffer, {\n access,\n addRandomSuffix,\n cacheControlMaxAge,\n contentType: mimeType,\n token,\n })\n\n if (addRandomSuffix) {\n const pathname = result.pathname.replace(/^\\/+/, '')\n const basename = path.posix.basename(pathname)\n return { filename: decodeURIComponent(basename) }\n }\n\n return {}\n}\n"],"names":["getFileKey","put","path","uploadFile","access","addRandomSuffix","buffer","cacheControlMaxAge","collectionPrefix","docPrefix","filename","mimeType","token","useCompositePrefixes","fileKey","result","contentType","pathname","replace","basename","posix","decodeURIComponent"],"mappings":"AAAA,SAASA,UAAU,QAAQ,6CAA4C;AACvE,SAASC,GAAG,QAAQ,eAAc;AAClC,OAAOC,UAAU,OAAM;AAmBvB,OAAO,eAAeC,WAAW,EAC/BC,MAAM,EACNC,eAAe,EACfC,MAAM,EACNC,kBAAkB,EAClBC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,QAAQ,EACRC,KAAK,EACLC,uBAAuB,KAAK,EACb;IACf,MAAM,EAAEC,OAAO,EAAE,GAAGd,WAAW;QAC7BQ;QACAC;QACAC;QACAG;IACF;IAEA,MAAME,SAAS,MAAMd,IAAIa,SAASR,QAAQ;QACxCF;QACAC;QACAE;QACAS,aAAaL;QACbC;IACF;IAEA,IAAIP,iBAAiB;QACnB,MAAMY,WAAWF,OAAOE,QAAQ,CAACC,OAAO,CAAC,QAAQ;QACjD,MAAMC,WAAWjB,KAAKkB,KAAK,CAACD,QAAQ,CAACF;QACrC,OAAO;YAAEP,UAAUW,mBAAmBF;QAAU;IAClD;IAEA,OAAO,CAAC;AACV"}
1
+ {"version":3,"sources":["../src/uploadFile.ts"],"sourcesContent":["import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { put } from '@vercel/blob'\nimport path from 'path'\n\ninterface UploadFileArgs {\n access: 'public'\n addRandomSuffix?: boolean\n buffer: Buffer\n cacheControlMaxAge?: number\n collectionPrefix?: string\n docPrefix?: string\n filename: string\n mimeType: string\n token: string\n useCompositePrefixes?: boolean\n}\n\ninterface UploadFileResult {\n filename?: string\n}\n\nexport async function uploadFile({\n access,\n addRandomSuffix,\n buffer,\n cacheControlMaxAge,\n collectionPrefix = '',\n docPrefix,\n filename,\n mimeType,\n token,\n useCompositePrefixes = false,\n}: UploadFileArgs): Promise<UploadFileResult> {\n const { fileKey } = getFileKey({\n collectionPrefix,\n docPrefix,\n filename,\n useCompositePrefixes,\n })\n\n const result = await put(fileKey, buffer, {\n access,\n addRandomSuffix,\n allowOverwrite: true,\n cacheControlMaxAge,\n contentType: mimeType,\n token,\n })\n\n if (addRandomSuffix) {\n const pathname = result.pathname.replace(/^\\/+/, '')\n const basename = path.posix.basename(pathname)\n return { filename: decodeURIComponent(basename) }\n }\n\n return {}\n}\n"],"names":["getFileKey","put","path","uploadFile","access","addRandomSuffix","buffer","cacheControlMaxAge","collectionPrefix","docPrefix","filename","mimeType","token","useCompositePrefixes","fileKey","result","allowOverwrite","contentType","pathname","replace","basename","posix","decodeURIComponent"],"mappings":"AAAA,SAASA,UAAU,QAAQ,6CAA4C;AACvE,SAASC,GAAG,QAAQ,eAAc;AAClC,OAAOC,UAAU,OAAM;AAmBvB,OAAO,eAAeC,WAAW,EAC/BC,MAAM,EACNC,eAAe,EACfC,MAAM,EACNC,kBAAkB,EAClBC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,QAAQ,EACRC,KAAK,EACLC,uBAAuB,KAAK,EACb;IACf,MAAM,EAAEC,OAAO,EAAE,GAAGd,WAAW;QAC7BQ;QACAC;QACAC;QACAG;IACF;IAEA,MAAME,SAAS,MAAMd,IAAIa,SAASR,QAAQ;QACxCF;QACAC;QACAW,gBAAgB;QAChBT;QACAU,aAAaN;QACbC;IACF;IAEA,IAAIP,iBAAiB;QACnB,MAAMa,WAAWH,OAAOG,QAAQ,CAACC,OAAO,CAAC,QAAQ;QACjD,MAAMC,WAAWlB,KAAKmB,KAAK,CAACD,QAAQ,CAACF;QACrC,OAAO;YAAER,UAAUY,mBAAmBF;QAAU;IAClD;IAEA,OAAO,CAAC;AACV"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@payloadcms/storage-vercel-blob",
3
- "version": "4.0.0-internal.cd69eef",
3
+ "version": "4.0.0-internal.d1cc1d3",
4
4
  "description": "Payload storage adapter for Vercel Blob Storage",
5
5
  "homepage": "https://payloadcms.com",
6
6
  "repository": {
@@ -38,13 +38,13 @@
38
38
  ],
39
39
  "dependencies": {
40
40
  "@vercel/blob": "2.3.1",
41
- "@payloadcms/plugin-cloud-storage": "4.0.0-internal.cd69eef"
41
+ "@payloadcms/plugin-cloud-storage": "4.0.0-internal.d1cc1d3"
42
42
  },
43
43
  "devDependencies": {
44
- "payload": "4.0.0-internal.cd69eef"
44
+ "payload": "4.0.0-internal.d1cc1d3"
45
45
  },
46
46
  "peerDependencies": {
47
- "payload": "4.0.0-internal.cd69eef"
47
+ "payload": "4.0.0-internal.d1cc1d3"
48
48
  },
49
49
  "engines": {
50
50
  "node": ">=24.15.0"