@payloadcms/storage-vercel-blob 3.7.0 → 3.7.1-canary.6b01088

package/dist/generateURL.js

@@ -1,7 +1,7 @@
 import path from 'path';
 export const getGenerateUrl = ({ baseUrl })=>{
     return ({ filename, prefix = '' })=>{
-        return `${baseUrl}/${path.posix.join(prefix, filename)}`;
+        return `${baseUrl}/${path.posix.join(prefix, encodeURIComponent(filename))}`;
     };
 };
 

package/dist/generateURL.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/generateURL.ts"],"sourcesContent":["import type { GenerateURL } from '@payloadcms/plugin-cloud-storage/types'\n\nimport path from 'path'\n\ntype GenerateUrlArgs = {\n  baseUrl: string\n  prefix?: string\n}\n\nexport const getGenerateUrl = ({ baseUrl }: GenerateUrlArgs): GenerateURL => {\n  return ({ filename, prefix = '' }) => {\n    return `${baseUrl}/${path.posix.join(prefix, filename)}`\n  }\n}\n"],"names":["path","getGenerateUrl","baseUrl","filename","prefix","posix","join"],"mappings":"AAEA,OAAOA,UAAU,OAAM;AAOvB,OAAO,MAAMC,iBAAiB,CAAC,EAAEC,OAAO,EAAmB;IACzD,OAAO,CAAC,EAAEC,QAAQ,EAAEC,SAAS,EAAE,EAAE;QAC/B,OAAO,GAAGF,QAAQ,CAAC,EAAEF,KAAKK,KAAK,CAACC,IAAI,CAACF,QAAQD,WAAW;IAC1D;AACF,EAAC"}
+{"version":3,"sources":["../src/generateURL.ts"],"sourcesContent":["import type { GenerateURL } from '@payloadcms/plugin-cloud-storage/types'\n\nimport path from 'path'\n\ntype GenerateUrlArgs = {\n  baseUrl: string\n  prefix?: string\n}\n\nexport const getGenerateUrl = ({ baseUrl }: GenerateUrlArgs): GenerateURL => {\n  return ({ filename, prefix = '' }) => {\n    return `${baseUrl}/${path.posix.join(prefix, encodeURIComponent(filename))}`\n  }\n}\n"],"names":["path","getGenerateUrl","baseUrl","filename","prefix","posix","join","encodeURIComponent"],"mappings":"AAEA,OAAOA,UAAU,OAAM;AAOvB,OAAO,MAAMC,iBAAiB,CAAC,EAAEC,OAAO,EAAmB;IACzD,OAAO,CAAC,EAAEC,QAAQ,EAAEC,SAAS,EAAE,EAAE;QAC/B,OAAO,GAAGF,QAAQ,CAAC,EAAEF,KAAKK,KAAK,CAACC,IAAI,CAACF,QAAQG,mBAAmBJ,YAAY;IAC9E;AACF,EAAC"}

package/dist/handleDelete.js

@@ -2,7 +2,7 @@ import { del } from '@vercel/blob';
 import path from 'path';
 export const getHandleDelete = ({ baseUrl, token })=>{
     return async ({ doc: { prefix = '' }, filename })=>{
-        const fileUrl = `${baseUrl}/${path.posix.join(prefix, filename)}`;
+        const fileUrl = `${baseUrl}/${path.posix.join(prefix, encodeURIComponent(filename))}`;
         const deletedBlob = await del(fileUrl, {
             token
         });

package/dist/handleDelete.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/handleDelete.ts"],"sourcesContent":["import type { HandleDelete } from '@payloadcms/plugin-cloud-storage/types'\n\nimport { del } from '@vercel/blob'\nimport path from 'path'\n\ntype HandleDeleteArgs = {\n  baseUrl: string\n  prefix?: string\n  token: string\n}\n\nexport const getHandleDelete = ({ baseUrl, token }: HandleDeleteArgs): HandleDelete => {\n  return async ({ doc: { prefix = '' }, filename }) => {\n    const fileUrl = `${baseUrl}/${path.posix.join(prefix, filename)}`\n    const deletedBlob = await del(fileUrl, { token })\n\n    return deletedBlob\n  }\n}\n"],"names":["del","path","getHandleDelete","baseUrl","token","doc","prefix","filename","fileUrl","posix","join","deletedBlob"],"mappings":"AAEA,SAASA,GAAG,QAAQ,eAAc;AAClC,OAAOC,UAAU,OAAM;AAQvB,OAAO,MAAMC,kBAAkB,CAAC,EAAEC,OAAO,EAAEC,KAAK,EAAoB;IAClE,OAAO,OAAO,EAAEC,KAAK,EAAEC,SAAS,EAAE,EAAE,EAAEC,QAAQ,EAAE;QAC9C,MAAMC,UAAU,GAAGL,QAAQ,CAAC,EAAEF,KAAKQ,KAAK,CAACC,IAAI,CAACJ,QAAQC,WAAW;QACjE,MAAMI,cAAc,MAAMX,IAAIQ,SAAS;YAAEJ;QAAM;QAE/C,OAAOO;IACT;AACF,EAAC"}
+{"version":3,"sources":["../src/handleDelete.ts"],"sourcesContent":["import type { HandleDelete } from '@payloadcms/plugin-cloud-storage/types'\n\nimport { del } from '@vercel/blob'\nimport path from 'path'\n\ntype HandleDeleteArgs = {\n  baseUrl: string\n  prefix?: string\n  token: string\n}\n\nexport const getHandleDelete = ({ baseUrl, token }: HandleDeleteArgs): HandleDelete => {\n  return async ({ doc: { prefix = '' }, filename }) => {\n    const fileUrl = `${baseUrl}/${path.posix.join(prefix, encodeURIComponent(filename))}`\n    const deletedBlob = await del(fileUrl, { token })\n\n    return deletedBlob\n  }\n}\n"],"names":["del","path","getHandleDelete","baseUrl","token","doc","prefix","filename","fileUrl","posix","join","encodeURIComponent","deletedBlob"],"mappings":"AAEA,SAASA,GAAG,QAAQ,eAAc;AAClC,OAAOC,UAAU,OAAM;AAQvB,OAAO,MAAMC,kBAAkB,CAAC,EAAEC,OAAO,EAAEC,KAAK,EAAoB;IAClE,OAAO,OAAO,EAAEC,KAAK,EAAEC,SAAS,EAAE,EAAE,EAAEC,QAAQ,EAAE;QAC9C,MAAMC,UAAU,GAAGL,QAAQ,CAAC,EAAEF,KAAKQ,KAAK,CAACC,IAAI,CAACJ,QAAQK,mBAAmBJ,YAAY;QACrF,MAAMK,cAAc,MAAMZ,IAAIQ,SAAS;YAAEJ;QAAM;QAE/C,OAAOQ;IACT;AACF,EAAC"}

package/dist/handleUpload.js

@@ -2,7 +2,7 @@ import { put } from '@vercel/blob';
 import path from 'path';
 export const getHandleUpload = ({ access = 'public', addRandomSuffix, baseUrl, cacheControlMaxAge, prefix = '', token })=>{
     return async ({ data, file: { buffer, filename, mimeType } })=>{
-        const fileKey = path.posix.join(data.prefix || prefix, filename);
+        const fileKey = path.posix.join(data.prefix || prefix, encodeURIComponent(filename));
         const result = await put(fileKey, buffer, {
             access,
             addRandomSuffix,

package/dist/handleUpload.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/handleUpload.ts"],"sourcesContent":["import type { HandleUpload } from '@payloadcms/plugin-cloud-storage/types'\n\nimport { put } from '@vercel/blob'\nimport path from 'path'\n\nimport type { VercelBlobStorageOptions } from './index.js'\n\ntype HandleUploadArgs = {\n  baseUrl: string\n  prefix?: string\n} & Omit<VercelBlobStorageOptions, 'collections'>\n\nexport const getHandleUpload = ({\n  access = 'public',\n  addRandomSuffix,\n  baseUrl,\n  cacheControlMaxAge,\n  prefix = '',\n  token,\n}: HandleUploadArgs): HandleUpload => {\n  return async ({ data, file: { buffer, filename, mimeType } }) => {\n    const fileKey = path.posix.join(data.prefix || prefix, filename)\n\n    const result = await put(fileKey, buffer, {\n      access,\n      addRandomSuffix,\n      cacheControlMaxAge,\n      contentType: mimeType,\n      token,\n    })\n\n    // Get filename with suffix from returned url\n    if (addRandomSuffix) {\n      data.filename = result.url.replace(`${baseUrl}/`, '')\n    }\n\n    return data\n  }\n}\n"],"names":["put","path","getHandleUpload","access","addRandomSuffix","baseUrl","cacheControlMaxAge","prefix","token","data","file","buffer","filename","mimeType","fileKey","posix","join","result","contentType","url","replace"],"mappings":"AAEA,SAASA,GAAG,QAAQ,eAAc;AAClC,OAAOC,UAAU,OAAM;AASvB,OAAO,MAAMC,kBAAkB,CAAC,EAC9BC,SAAS,QAAQ,EACjBC,eAAe,EACfC,OAAO,EACPC,kBAAkB,EAClBC,SAAS,EAAE,EACXC,KAAK,EACY;IACjB,OAAO,OAAO,EAAEC,IAAI,EAAEC,MAAM,EAAEC,MAAM,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,EAAE;QAC1D,MAAMC,UAAUb,KAAKc,KAAK,CAACC,IAAI,CAACP,KAAKF,MAAM,IAAIA,QAAQK;QAEvD,MAAMK,SAAS,MAAMjB,IAAIc,SAASH,QAAQ;YACxCR;YACAC;YACAE;YACAY,aAAaL;YACbL;QACF;QAEA,6CAA6C;QAC7C,IAAIJ,iBAAiB;YACnBK,KAAKG,QAAQ,GAAGK,OAAOE,GAAG,CAACC,OAAO,CAAC,GAAGf,QAAQ,CAAC,CAAC,EAAE;QACpD;QAEA,OAAOI;IACT;AACF,EAAC"}
+{"version":3,"sources":["../src/handleUpload.ts"],"sourcesContent":["import type { HandleUpload } from '@payloadcms/plugin-cloud-storage/types'\n\nimport { put } from '@vercel/blob'\nimport path from 'path'\n\nimport type { VercelBlobStorageOptions } from './index.js'\n\ntype HandleUploadArgs = {\n  baseUrl: string\n  prefix?: string\n} & Omit<VercelBlobStorageOptions, 'collections'>\n\nexport const getHandleUpload = ({\n  access = 'public',\n  addRandomSuffix,\n  baseUrl,\n  cacheControlMaxAge,\n  prefix = '',\n  token,\n}: HandleUploadArgs): HandleUpload => {\n  return async ({ data, file: { buffer, filename, mimeType } }) => {\n    const fileKey = path.posix.join(data.prefix || prefix, encodeURIComponent(filename))\n\n    const result = await put(fileKey, buffer, {\n      access,\n      addRandomSuffix,\n      cacheControlMaxAge,\n      contentType: mimeType,\n      token,\n    })\n\n    // Get filename with suffix from returned url\n    if (addRandomSuffix) {\n      data.filename = result.url.replace(`${baseUrl}/`, '')\n    }\n\n    return data\n  }\n}\n"],"names":["put","path","getHandleUpload","access","addRandomSuffix","baseUrl","cacheControlMaxAge","prefix","token","data","file","buffer","filename","mimeType","fileKey","posix","join","encodeURIComponent","result","contentType","url","replace"],"mappings":"AAEA,SAASA,GAAG,QAAQ,eAAc;AAClC,OAAOC,UAAU,OAAM;AASvB,OAAO,MAAMC,kBAAkB,CAAC,EAC9BC,SAAS,QAAQ,EACjBC,eAAe,EACfC,OAAO,EACPC,kBAAkB,EAClBC,SAAS,EAAE,EACXC,KAAK,EACY;IACjB,OAAO,OAAO,EAAEC,IAAI,EAAEC,MAAM,EAAEC,MAAM,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,EAAE;QAC1D,MAAMC,UAAUb,KAAKc,KAAK,CAACC,IAAI,CAACP,KAAKF,MAAM,IAAIA,QAAQU,mBAAmBL;QAE1E,MAAMM,SAAS,MAAMlB,IAAIc,SAASH,QAAQ;YACxCR;YACAC;YACAE;YACAa,aAAaN;YACbL;QACF;QAEA,6CAA6C;QAC7C,IAAIJ,iBAAiB;YACnBK,KAAKG,QAAQ,GAAGM,OAAOE,GAAG,CAACC,OAAO,CAAC,GAAGhB,QAAQ,CAAC,CAAC,EAAE;QACpD;QAEA,OAAOI;IACT;AACF,EAAC"}

package/dist/index.d.ts

@@ -34,8 +34,10 @@ export type VercelBlobStorageOptions = {
      * Vercel Blob storage read/write token
      *
      * Usually process.env.BLOB_READ_WRITE_TOKEN set by Vercel
+     *
+     * If unset, the plugin will be disabled and will fallback to local storage
      */
-    token: string;
+    token: string | undefined;
 };
 type VercelBlobStoragePlugin = (vercelBlobStorageOpts: VercelBlobStorageOptions) => Plugin;
 export declare const vercelBlobStorage: VercelBlobStoragePlugin;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,iBAAiB,EAElB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AASnE,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IAEzB;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAE3B;;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;IAEjB;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AASD,KAAK,uBAAuB,GAAG,CAAC,qBAAqB,EAAE,wBAAwB,KAAK,MAAM,CAAA;AAE1F,eAAO,MAAM,iBAAiB,EAAE,uBAgE7B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,iBAAiB,EAElB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AASnE,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IAEzB;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAE3B;;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;IAEjB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AASD,KAAK,uBAAuB,GAAG,CAAC,qBAAqB,EAAE,wBAAwB,KAAK,MAAM,CAAA;AAE1F,eAAO,MAAM,iBAAiB,EAAE,uBA6D7B,CAAA"}

package/dist/index.js

@@ -10,12 +10,10 @@ const defaultUploadOptions = {
     enabled: true
 };
 export const vercelBlobStorage = (options)=>(incomingConfig)=>{
-        if (options.enabled === false) {
+        // If the plugin is disabled or no token is provided, do not enable the plugin
+        if (options.enabled === false || !options.token) {
             return incomingConfig;
         }
-        if (!options.token) {
-            throw new Error('The token argument is required for the Vercel Blob adapter.');
-        }
         // Parse storeId from token
         const storeId = options.token.match(/^vercel_blob_rw_([a-z\d]+)_[a-z\d]+$/i)?.[1]?.toLowerCase();
         if (!storeId) {
@@ -61,6 +59,9 @@ export const vercelBlobStorage = (options)=>(incomingConfig)=>{
 function vercelBlobStorageInternal(options) {
     return ({ collection, prefix })=>{
         const { access, addRandomSuffix, baseUrl, cacheControlMaxAge, token } = options;
+        if (!token) {
+            throw new Error('Vercel Blob storage token is required');
+        }
         return {
             name: 'vercel-blob',
             generateURL: getGenerateUrl({
@@ -70,7 +71,7 @@ function vercelBlobStorageInternal(options) {
             handleDelete: getHandleDelete({
                 baseUrl,
                 prefix,
-                token: options.token
+                token
             }),
             handleUpload: getHandleUpload({
                 access,

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n  Adapter,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, Plugin, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\n\nimport { getGenerateUrl } from './generateURL.js'\nimport { getHandleDelete } from './handleDelete.js'\nimport { getHandleUpload } from './handleUpload.js'\nimport { getStaticHandler } from './staticHandler.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   * Cache-Control max-age in seconds\n   *\n   * @defaultvalue 365 * 24 * 60 * 60 (1 Year)\n   */\n  cacheControlMaxAge?: number\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  /**\n   * Vercel Blob storage read/write token\n   *\n   * Usually process.env.BLOB_READ_WRITE_TOKEN set by Vercel\n   */\n  token: string\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 VercelBlobStoragePlugin = (vercelBlobStorageOpts: VercelBlobStorageOptions) => Plugin\n\nexport const vercelBlobStorage: VercelBlobStoragePlugin =\n  (options: VercelBlobStorageOptions) =>\n  (incomingConfig: Config): Config => {\n    if (options.enabled === false) {\n      return incomingConfig\n    }\n\n    if (!options.token) {\n      throw new Error('The token argument is required for the Vercel Blob adapter.')\n    }\n\n    // Parse storeId from token\n    const storeId = options.token.match(/^vercel_blob_rw_([a-z\\d]+)_[a-z\\d]+$/i)?.[1]?.toLowerCase()\n\n    if (!storeId) {\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    const baseUrl = `https://${storeId}.${optionsWithDefaults.access}.blob.vercel-storage.com`\n\n    const adapter = vercelBlobStorageInternal({ ...optionsWithDefaults, baseUrl })\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      collections: collectionsWithAdapter,\n    })(config)\n  }\n\nfunction vercelBlobStorageInternal(\n  options: { baseUrl: string } & VercelBlobStorageOptions,\n): Adapter {\n  return ({ collection, prefix }): GeneratedAdapter => {\n    const { access, addRandomSuffix, baseUrl, cacheControlMaxAge, token } = options\n    return {\n      name: 'vercel-blob',\n      generateURL: getGenerateUrl({ baseUrl, prefix }),\n      handleDelete: getHandleDelete({ baseUrl, prefix, token: options.token }),\n      handleUpload: getHandleUpload({\n        access,\n        addRandomSuffix,\n        baseUrl,\n        cacheControlMaxAge,\n        prefix,\n        token,\n      }),\n      staticHandler: getStaticHandler({ baseUrl, cacheControlMaxAge, token }, collection),\n    }\n  }\n}\n"],"names":["cloudStoragePlugin","getGenerateUrl","getHandleDelete","getHandleUpload","getStaticHandler","defaultUploadOptions","access","addRandomSuffix","cacheControlMaxAge","enabled","vercelBlobStorage","options","incomingConfig","token","Error","storeId","match","toLowerCase","optionsWithDefaults","baseUrl","adapter","vercelBlobStorageInternal","collectionsWithAdapter","Object","entries","collections","reduce","acc","slug","collOptions","config","map","collection","upload","disableLocalStorage","prefix","name","generateURL","handleDelete","handleUpload","staticHandler"],"mappings":"AAQA,SAASA,kBAAkB,QAAQ,mCAAkC;AAErE,SAASC,cAAc,QAAQ,mBAAkB;AACjD,SAASC,eAAe,QAAQ,oBAAmB;AACnD,SAASC,eAAe,QAAQ,oBAAmB;AACnD,SAASC,gBAAgB,QAAQ,qBAAoB;AA6CrD,MAAMC,uBAA0D;IAC9DC,QAAQ;IACRC,iBAAiB;IACjBC,oBAAoB,KAAK,KAAK,KAAK;IACnCC,SAAS;AACX;AAIA,OAAO,MAAMC,oBACX,CAACC,UACD,CAACC;QACC,IAAID,QAAQF,OAAO,KAAK,OAAO;YAC7B,OAAOG;QACT;QAEA,IAAI,CAACD,QAAQE,KAAK,EAAE;YAClB,MAAM,IAAIC,MAAM;QAClB;QAEA,2BAA2B;QAC3B,MAAMC,UAAUJ,QAAQE,KAAK,CAACG,KAAK,CAAC,0CAA0C,CAAC,EAAE,EAAEC;QAEnF,IAAI,CAACF,SAAS;YACZ,MAAM,IAAID,MACR;QAEJ;QAEA,MAAMI,sBAAsB;YAC1B,GAAGb,oBAAoB;YACvB,GAAGM,OAAO;QACZ;QAEA,MAAMQ,UAAU,CAAC,QAAQ,EAAEJ,QAAQ,CAAC,EAAEG,oBAAoBZ,MAAM,CAAC,wBAAwB,CAAC;QAE1F,MAAMc,UAAUC,0BAA0B;YAAE,GAAGH,mBAAmB;YAAEC;QAAQ;QAE5E,+CAA+C;QAC/C,MAAMG,yBAAmEC,OAAOC,OAAO,CACrFb,QAAQc,WAAW,EACnBC,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;gBAC7B,GAAGF,GAAG;gBACN,CAACC,KAAK,EAAE;oBACN,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;oBAC3CT;gBACF;YACF,CAAA,GACA,CAAC;QAGH,gFAAgF;QAChF,MAAMU,SAAS;YACb,GAAGlB,cAAc;YACjBa,aAAa,AAACb,CAAAA,eAAea,WAAW,IAAI,EAAE,AAAD,EAAGM,GAAG,CAAC,CAACC;gBACnD,IAAI,CAACV,sBAAsB,CAACU,WAAWJ,IAAI,CAAC,EAAE;oBAC5C,OAAOI;gBACT;gBAEA,OAAO;oBACL,GAAGA,UAAU;oBACbC,QAAQ;wBACN,GAAI,OAAOD,WAAWC,MAAM,KAAK,WAAWD,WAAWC,MAAM,GAAG,CAAC,CAAC;wBAClEC,qBAAqB;oBACvB;gBACF;YACF;QACF;QAEA,OAAOlC,mBAAmB;YACxByB,aAAaH;QACf,GAAGQ;IACL,EAAC;AAEH,SAAST,0BACPV,OAAuD;IAEvD,OAAO,CAAC,EAAEqB,UAAU,EAAEG,MAAM,EAAE;QAC5B,MAAM,EAAE7B,MAAM,EAAEC,eAAe,EAAEY,OAAO,EAAEX,kBAAkB,EAAEK,KAAK,EAAE,GAAGF;QACxE,OAAO;YACLyB,MAAM;YACNC,aAAapC,eAAe;gBAAEkB;gBAASgB;YAAO;YAC9CG,cAAcpC,gBAAgB;gBAAEiB;gBAASgB;gBAAQtB,OAAOF,QAAQE,KAAK;YAAC;YACtE0B,cAAcpC,gBAAgB;gBAC5BG;gBACAC;gBACAY;gBACAX;gBACA2B;gBACAtB;YACF;YACA2B,eAAepC,iBAAiB;gBAAEe;gBAASX;gBAAoBK;YAAM,GAAGmB;QAC1E;IACF;AACF"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n  Adapter,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, Plugin, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\n\nimport { getGenerateUrl } from './generateURL.js'\nimport { getHandleDelete } from './handleDelete.js'\nimport { getHandleUpload } from './handleUpload.js'\nimport { getStaticHandler } from './staticHandler.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   * Cache-Control max-age in seconds\n   *\n   * @defaultvalue 365 * 24 * 60 * 60 (1 Year)\n   */\n  cacheControlMaxAge?: number\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  /**\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\nconst defaultUploadOptions: Partial<VercelBlobStorageOptions> = {\n  access: 'public',\n  addRandomSuffix: false,\n  cacheControlMaxAge: 60 * 60 * 24 * 365, // 1 year\n  enabled: true,\n}\n\ntype VercelBlobStoragePlugin = (vercelBlobStorageOpts: VercelBlobStorageOptions) => Plugin\n\nexport const vercelBlobStorage: VercelBlobStoragePlugin =\n  (options: VercelBlobStorageOptions) =>\n  (incomingConfig: Config): Config => {\n    // If the plugin is disabled or no token is provided, do not enable the plugin\n    if (options.enabled === false || !options.token) {\n      return incomingConfig\n    }\n\n    // Parse storeId from token\n    const storeId = options.token.match(/^vercel_blob_rw_([a-z\\d]+)_[a-z\\d]+$/i)?.[1]?.toLowerCase()\n\n    if (!storeId) {\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    const baseUrl = `https://${storeId}.${optionsWithDefaults.access}.blob.vercel-storage.com`\n\n    const adapter = vercelBlobStorageInternal({ ...optionsWithDefaults, baseUrl })\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      collections: collectionsWithAdapter,\n    })(config)\n  }\n\nfunction vercelBlobStorageInternal(\n  options: { baseUrl: string } & VercelBlobStorageOptions,\n): Adapter {\n  return ({ collection, prefix }): GeneratedAdapter => {\n    const { access, addRandomSuffix, baseUrl, cacheControlMaxAge, token } = options\n\n    if (!token) {\n      throw new Error('Vercel Blob storage token is required')\n    }\n\n    return {\n      name: 'vercel-blob',\n      generateURL: getGenerateUrl({ baseUrl, prefix }),\n      handleDelete: getHandleDelete({ baseUrl, prefix, token }),\n      handleUpload: getHandleUpload({\n        access,\n        addRandomSuffix,\n        baseUrl,\n        cacheControlMaxAge,\n        prefix,\n        token,\n      }),\n      staticHandler: getStaticHandler({ baseUrl, cacheControlMaxAge, token }, collection),\n    }\n  }\n}\n"],"names":["cloudStoragePlugin","getGenerateUrl","getHandleDelete","getHandleUpload","getStaticHandler","defaultUploadOptions","access","addRandomSuffix","cacheControlMaxAge","enabled","vercelBlobStorage","options","incomingConfig","token","storeId","match","toLowerCase","Error","optionsWithDefaults","baseUrl","adapter","vercelBlobStorageInternal","collectionsWithAdapter","Object","entries","collections","reduce","acc","slug","collOptions","config","map","collection","upload","disableLocalStorage","prefix","name","generateURL","handleDelete","handleUpload","staticHandler"],"mappings":"AAQA,SAASA,kBAAkB,QAAQ,mCAAkC;AAErE,SAASC,cAAc,QAAQ,mBAAkB;AACjD,SAASC,eAAe,QAAQ,oBAAmB;AACnD,SAASC,eAAe,QAAQ,oBAAmB;AACnD,SAASC,gBAAgB,QAAQ,qBAAoB;AA+CrD,MAAMC,uBAA0D;IAC9DC,QAAQ;IACRC,iBAAiB;IACjBC,oBAAoB,KAAK,KAAK,KAAK;IACnCC,SAAS;AACX;AAIA,OAAO,MAAMC,oBACX,CAACC,UACD,CAACC;QACC,8EAA8E;QAC9E,IAAID,QAAQF,OAAO,KAAK,SAAS,CAACE,QAAQE,KAAK,EAAE;YAC/C,OAAOD;QACT;QAEA,2BAA2B;QAC3B,MAAME,UAAUH,QAAQE,KAAK,CAACE,KAAK,CAAC,0CAA0C,CAAC,EAAE,EAAEC;QAEnF,IAAI,CAACF,SAAS;YACZ,MAAM,IAAIG,MACR;QAEJ;QAEA,MAAMC,sBAAsB;YAC1B,GAAGb,oBAAoB;YACvB,GAAGM,OAAO;QACZ;QAEA,MAAMQ,UAAU,CAAC,QAAQ,EAAEL,QAAQ,CAAC,EAAEI,oBAAoBZ,MAAM,CAAC,wBAAwB,CAAC;QAE1F,MAAMc,UAAUC,0BAA0B;YAAE,GAAGH,mBAAmB;YAAEC;QAAQ;QAE5E,+CAA+C;QAC/C,MAAMG,yBAAmEC,OAAOC,OAAO,CACrFb,QAAQc,WAAW,EACnBC,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;gBAC7B,GAAGF,GAAG;gBACN,CAACC,KAAK,EAAE;oBACN,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;oBAC3CT;gBACF;YACF,CAAA,GACA,CAAC;QAGH,gFAAgF;QAChF,MAAMU,SAAS;YACb,GAAGlB,cAAc;YACjBa,aAAa,AAACb,CAAAA,eAAea,WAAW,IAAI,EAAE,AAAD,EAAGM,GAAG,CAAC,CAACC;gBACnD,IAAI,CAACV,sBAAsB,CAACU,WAAWJ,IAAI,CAAC,EAAE;oBAC5C,OAAOI;gBACT;gBAEA,OAAO;oBACL,GAAGA,UAAU;oBACbC,QAAQ;wBACN,GAAI,OAAOD,WAAWC,MAAM,KAAK,WAAWD,WAAWC,MAAM,GAAG,CAAC,CAAC;wBAClEC,qBAAqB;oBACvB;gBACF;YACF;QACF;QAEA,OAAOlC,mBAAmB;YACxByB,aAAaH;QACf,GAAGQ;IACL,EAAC;AAEH,SAAST,0BACPV,OAAuD;IAEvD,OAAO,CAAC,EAAEqB,UAAU,EAAEG,MAAM,EAAE;QAC5B,MAAM,EAAE7B,MAAM,EAAEC,eAAe,EAAEY,OAAO,EAAEX,kBAAkB,EAAEK,KAAK,EAAE,GAAGF;QAExE,IAAI,CAACE,OAAO;YACV,MAAM,IAAII,MAAM;QAClB;QAEA,OAAO;YACLmB,MAAM;YACNC,aAAapC,eAAe;gBAAEkB;gBAASgB;YAAO;YAC9CG,cAAcpC,gBAAgB;gBAAEiB;gBAASgB;gBAAQtB;YAAM;YACvD0B,cAAcpC,gBAAgB;gBAC5BG;gBACAC;gBACAY;gBACAX;gBACA2B;gBACAtB;YACF;YACA2B,eAAepC,iBAAiB;gBAAEe;gBAASX;gBAAoBK;YAAM,GAAGmB;QAC1E;IACF;AACF"}

package/dist/staticHandler.js

@@ -9,7 +9,7 @@ export const getStaticHandler = ({ baseUrl, cacheControlMaxAge = 0, token }, col
                 filename,
                 req
             });
-            const fileUrl = `${baseUrl}/${path.posix.join(prefix, filename)}`;
+            const fileUrl = `${baseUrl}/${path.posix.join(prefix, encodeURIComponent(filename))}`;
             const blobMetadata = await head(fileUrl, {
                 token
             });

package/dist/staticHandler.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'\nimport type { CollectionConfig } from 'payload'\n\nimport { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { head } from '@vercel/blob'\nimport path from 'path'\n\ntype StaticHandlerArgs = {\n  baseUrl: string\n  cacheControlMaxAge?: number\n  token: string\n}\n\nexport const getStaticHandler = (\n  { baseUrl, cacheControlMaxAge = 0, token }: StaticHandlerArgs,\n  collection: CollectionConfig,\n): StaticHandler => {\n  return async (req, { params: { filename } }) => {\n    try {\n      const prefix = await getFilePrefix({ collection, filename, req })\n\n      const fileUrl = `${baseUrl}/${path.posix.join(prefix, filename)}`\n\n      const blobMetadata = await head(fileUrl, { token })\n      if (!blobMetadata) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\n      }\n\n      const { contentDisposition, contentType, size } = blobMetadata\n      const response = await fetch(fileUrl)\n      const blob = await response.blob()\n\n      if (!blob) {\n        return new Response(null, { status: 204, statusText: 'No Content' })\n      }\n\n      const bodyBuffer = await blob.arrayBuffer()\n\n      return new Response(bodyBuffer, {\n        headers: new Headers({\n          'Cache-Control': `public, max-age=${cacheControlMaxAge}`,\n          'Content-Disposition': contentDisposition,\n          'Content-Length': String(size),\n          'Content-Type': contentType,\n        }),\n        status: 200,\n      })\n    } catch (err: unknown) {\n      req.payload.logger.error({ err, msg: 'Unexpected error in staticHandler' })\n      return new Response('Internal Server Error', { status: 500 })\n    }\n  }\n}\n"],"names":["getFilePrefix","head","path","getStaticHandler","baseUrl","cacheControlMaxAge","token","collection","req","params","filename","prefix","fileUrl","posix","join","blobMetadata","Response","status","statusText","contentDisposition","contentType","size","response","fetch","blob","bodyBuffer","arrayBuffer","headers","Headers","String","err","payload","logger","error","msg"],"mappings":"AAGA,SAASA,aAAa,QAAQ,6CAA4C;AAC1E,SAASC,IAAI,QAAQ,eAAc;AACnC,OAAOC,UAAU,OAAM;AAQvB,OAAO,MAAMC,mBAAmB,CAC9B,EAAEC,OAAO,EAAEC,qBAAqB,CAAC,EAAEC,KAAK,EAAqB,EAC7DC;IAEA,OAAO,OAAOC,KAAK,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,EAAE;QACzC,IAAI;YACF,MAAMC,SAAS,MAAMX,cAAc;gBAAEO;gBAAYG;gBAAUF;YAAI;YAE/D,MAAMI,UAAU,GAAGR,QAAQ,CAAC,EAAEF,KAAKW,KAAK,CAACC,IAAI,CAACH,QAAQD,WAAW;YAEjE,MAAMK,eAAe,MAAMd,KAAKW,SAAS;gBAAEN;YAAM;YACjD,IAAI,CAACS,cAAc;gBACjB,OAAO,IAAIC,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAY;YACnE;YAEA,MAAM,EAAEC,kBAAkB,EAAEC,WAAW,EAAEC,IAAI,EAAE,GAAGN;YAClD,MAAMO,WAAW,MAAMC,MAAMX;YAC7B,MAAMY,OAAO,MAAMF,SAASE,IAAI;YAEhC,IAAI,CAACA,MAAM;gBACT,OAAO,IAAIR,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAa;YACpE;YAEA,MAAMO,aAAa,MAAMD,KAAKE,WAAW;YAEzC,OAAO,IAAIV,SAASS,YAAY;gBAC9BE,SAAS,IAAIC,QAAQ;oBACnB,iBAAiB,CAAC,gBAAgB,EAAEvB,oBAAoB;oBACxD,uBAAuBc;oBACvB,kBAAkBU,OAAOR;oBACzB,gBAAgBD;gBAClB;gBACAH,QAAQ;YACV;QACF,EAAE,OAAOa,KAAc;YACrBtB,IAAIuB,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;gBAAEH;gBAAKI,KAAK;YAAoC;YACzE,OAAO,IAAIlB,SAAS,yBAAyB;gBAAEC,QAAQ;YAAI;QAC7D;IACF;AACF,EAAC"}
+{"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'\nimport type { CollectionConfig } from 'payload'\n\nimport { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { head } from '@vercel/blob'\nimport path from 'path'\n\ntype StaticHandlerArgs = {\n  baseUrl: string\n  cacheControlMaxAge?: number\n  token: string\n}\n\nexport const getStaticHandler = (\n  { baseUrl, cacheControlMaxAge = 0, token }: StaticHandlerArgs,\n  collection: CollectionConfig,\n): StaticHandler => {\n  return async (req, { params: { filename } }) => {\n    try {\n      const prefix = await getFilePrefix({ collection, filename, req })\n\n      const fileUrl = `${baseUrl}/${path.posix.join(prefix, encodeURIComponent(filename))}`\n\n      const blobMetadata = await head(fileUrl, { token })\n      if (!blobMetadata) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\n      }\n\n      const { contentDisposition, contentType, size } = blobMetadata\n      const response = await fetch(fileUrl)\n      const blob = await response.blob()\n\n      if (!blob) {\n        return new Response(null, { status: 204, statusText: 'No Content' })\n      }\n\n      const bodyBuffer = await blob.arrayBuffer()\n\n      return new Response(bodyBuffer, {\n        headers: new Headers({\n          'Cache-Control': `public, max-age=${cacheControlMaxAge}`,\n          'Content-Disposition': contentDisposition,\n          'Content-Length': String(size),\n          'Content-Type': contentType,\n        }),\n        status: 200,\n      })\n    } catch (err: unknown) {\n      req.payload.logger.error({ err, msg: 'Unexpected error in staticHandler' })\n      return new Response('Internal Server Error', { status: 500 })\n    }\n  }\n}\n"],"names":["getFilePrefix","head","path","getStaticHandler","baseUrl","cacheControlMaxAge","token","collection","req","params","filename","prefix","fileUrl","posix","join","encodeURIComponent","blobMetadata","Response","status","statusText","contentDisposition","contentType","size","response","fetch","blob","bodyBuffer","arrayBuffer","headers","Headers","String","err","payload","logger","error","msg"],"mappings":"AAGA,SAASA,aAAa,QAAQ,6CAA4C;AAC1E,SAASC,IAAI,QAAQ,eAAc;AACnC,OAAOC,UAAU,OAAM;AAQvB,OAAO,MAAMC,mBAAmB,CAC9B,EAAEC,OAAO,EAAEC,qBAAqB,CAAC,EAAEC,KAAK,EAAqB,EAC7DC;IAEA,OAAO,OAAOC,KAAK,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,EAAE;QACzC,IAAI;YACF,MAAMC,SAAS,MAAMX,cAAc;gBAAEO;gBAAYG;gBAAUF;YAAI;YAE/D,MAAMI,UAAU,GAAGR,QAAQ,CAAC,EAAEF,KAAKW,KAAK,CAACC,IAAI,CAACH,QAAQI,mBAAmBL,YAAY;YAErF,MAAMM,eAAe,MAAMf,KAAKW,SAAS;gBAAEN;YAAM;YACjD,IAAI,CAACU,cAAc;gBACjB,OAAO,IAAIC,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAY;YACnE;YAEA,MAAM,EAAEC,kBAAkB,EAAEC,WAAW,EAAEC,IAAI,EAAE,GAAGN;YAClD,MAAMO,WAAW,MAAMC,MAAMZ;YAC7B,MAAMa,OAAO,MAAMF,SAASE,IAAI;YAEhC,IAAI,CAACA,MAAM;gBACT,OAAO,IAAIR,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAa;YACpE;YAEA,MAAMO,aAAa,MAAMD,KAAKE,WAAW;YAEzC,OAAO,IAAIV,SAASS,YAAY;gBAC9BE,SAAS,IAAIC,QAAQ;oBACnB,iBAAiB,CAAC,gBAAgB,EAAExB,oBAAoB;oBACxD,uBAAuBe;oBACvB,kBAAkBU,OAAOR;oBACzB,gBAAgBD;gBAClB;gBACAH,QAAQ;YACV;QACF,EAAE,OAAOa,KAAc;YACrBvB,IAAIwB,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;gBAAEH;gBAAKI,KAAK;YAAoC;YACzE,OAAO,IAAIlB,SAAS,yBAAyB;gBAAEC,QAAQ;YAAI;QAC7D;IACF;AACF,EAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-vercel-blob",
-  "version": "3.7.0",
+  "version": "3.7.1-canary.6b01088",
   "description": "Payload storage adapter for Vercel Blob Storage",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -32,13 +32,13 @@
   ],
   "dependencies": {
     "@vercel/blob": "^0.22.3",
-    "@payloadcms/plugin-cloud-storage": "3.7.0"
+    "@payloadcms/plugin-cloud-storage": "3.7.1-canary.6b01088"
   },
   "devDependencies": {
-    "payload": "3.7.0"
+    "payload": "3.7.1-canary.6b01088"
   },
   "peerDependencies": {
-    "payload": "3.7.0"
+    "payload": "3.7.1-canary.6b01088"
   },
   "engines": {
     "node": "^18.20.2 || >=20.9.0"