@payloadcms/plugin-cloud-storage 4.0.0-internal.435b2d6 → 4.0.0-internal.442e8b6

package/dist/hooks/beforeChange.js

@@ -1,8 +1,19 @@
+import { sanitizePrefix } from '../utilities/sanitizePrefix.js';
+// The object's folder: semantic prefix + `_objectKey` segment.
+const getObjectFolder = (data, originalDoc)=>{
+    const source = data ?? originalDoc ?? {};
+    const safePrefix = sanitizePrefix(typeof source.prefix === 'string' ? source.prefix : '');
+    const safeObjectKey = sanitizePrefix(typeof source._objectKey === 'string' ? source._objectKey : '');
+    if (safePrefix && safeObjectKey) {
+        return `${safePrefix}/${safeObjectKey}`;
+    }
+    return safePrefix || safeObjectKey;
+};
 export const getBeforeChangeHook = ({ adapter, collection, disablePayloadAccessControl, generateFileURL, size })=>async ({ data, originalDoc, value })=>{
         const newFilename = size ? data?.sizes?.[size.name]?.filename : data?.filename;
         const originalFilename = size ? originalDoc?.sizes?.[size.name]?.filename : originalDoc?.filename;
         const filename = newFilename || originalFilename;
-        const prefix = data?.prefix;
+        const prefix = getObjectFolder(data, originalDoc);
         let url = value;
         if (generateFileURL && filename) {
             url = await generateFileURL({

package/dist/hooks/beforeChange.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/beforeChange.ts"],"sourcesContent":["import type { CollectionConfig, FieldHook, ImageSize } from 'payload'\n\nimport type { GeneratedAdapter, GenerateFileURL } from '../types.js'\n\ninterface Args {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n  disablePayloadAccessControl?: boolean\n  generateFileURL?: GenerateFileURL\n  size?: ImageSize\n}\n\nexport const getBeforeChangeHook =\n  ({ adapter, collection, disablePayloadAccessControl, generateFileURL, size }: Args): FieldHook =>\n  async ({ data, originalDoc, value }) => {\n    const newFilename = size ? data?.sizes?.[size.name]?.filename : data?.filename\n    const originalFilename = size\n      ? originalDoc?.sizes?.[size.name]?.filename\n      : originalDoc?.filename\n    const filename = newFilename || originalFilename\n    const prefix = data?.prefix\n    let url = value\n\n    if (generateFileURL && filename) {\n      url = await generateFileURL({\n        collection,\n        filename,\n        prefix,\n        size,\n      })\n    } else if (disablePayloadAccessControl && filename && adapter.generateURL) {\n      url = await adapter.generateURL({\n        collection,\n        data: data || originalDoc,\n        filename,\n        prefix,\n      })\n    }\n\n    return url\n  }\n"],"names":["getBeforeChangeHook","adapter","collection","disablePayloadAccessControl","generateFileURL","size","data","originalDoc","value","newFilename","sizes","name","filename","originalFilename","prefix","url","generateURL"],"mappings":"AAYA,OAAO,MAAMA,sBACX,CAAC,EAAEC,OAAO,EAAEC,UAAU,EAAEC,2BAA2B,EAAEC,eAAe,EAAEC,IAAI,EAAQ,GAClF,OAAO,EAAEC,IAAI,EAAEC,WAAW,EAAEC,KAAK,EAAE;QACjC,MAAMC,cAAcJ,OAAOC,MAAMI,OAAO,CAACL,KAAKM,IAAI,CAAC,EAAEC,WAAWN,MAAMM;QACtE,MAAMC,mBAAmBR,OACrBE,aAAaG,OAAO,CAACL,KAAKM,IAAI,CAAC,EAAEC,WACjCL,aAAaK;QACjB,MAAMA,WAAWH,eAAeI;QAChC,MAAMC,SAASR,MAAMQ;QACrB,IAAIC,MAAMP;QAEV,IAAIJ,mBAAmBQ,UAAU;YAC/BG,MAAM,MAAMX,gBAAgB;gBAC1BF;gBACAU;gBACAE;gBACAT;YACF;QACF,OAAO,IAAIF,+BAA+BS,YAAYX,QAAQe,WAAW,EAAE;YACzED,MAAM,MAAMd,QAAQe,WAAW,CAAC;gBAC9Bd;gBACAI,MAAMA,QAAQC;gBACdK;gBACAE;YACF;QACF;QAEA,OAAOC;IACT,EAAC"}
+{"version":3,"sources":["../../src/hooks/beforeChange.ts"],"sourcesContent":["import type { CollectionConfig, FieldHook, ImageSize } from 'payload'\n\nimport type { GeneratedAdapter, GenerateFileURL } from '../types.js'\n\nimport { sanitizePrefix } from '../utilities/sanitizePrefix.js'\n\ninterface Args {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n  disablePayloadAccessControl?: boolean\n  generateFileURL?: GenerateFileURL\n  size?: ImageSize\n}\n\n// The object's folder: semantic prefix + `_objectKey` segment.\nconst getObjectFolder = (data: unknown, originalDoc: unknown): string => {\n  const source = (data ?? originalDoc ?? {}) as Record<string, unknown>\n  const safePrefix = sanitizePrefix(typeof source.prefix === 'string' ? source.prefix : '')\n  const safeObjectKey = sanitizePrefix(\n    typeof source._objectKey === 'string' ? source._objectKey : '',\n  )\n\n  if (safePrefix && safeObjectKey) {\n    return `${safePrefix}/${safeObjectKey}`\n  }\n\n  return safePrefix || safeObjectKey\n}\n\nexport const getBeforeChangeHook =\n  ({ adapter, collection, disablePayloadAccessControl, generateFileURL, size }: Args): FieldHook =>\n  async ({ data, originalDoc, value }) => {\n    const newFilename = size ? data?.sizes?.[size.name]?.filename : data?.filename\n    const originalFilename = size\n      ? originalDoc?.sizes?.[size.name]?.filename\n      : originalDoc?.filename\n    const filename = newFilename || originalFilename\n    const prefix = getObjectFolder(data, originalDoc)\n    let url = value\n\n    if (generateFileURL && filename) {\n      url = await generateFileURL({\n        collection,\n        filename,\n        prefix,\n        size,\n      })\n    } else if (disablePayloadAccessControl && filename && adapter.generateURL) {\n      url = await adapter.generateURL({\n        collection,\n        data: data || originalDoc,\n        filename,\n        prefix,\n      })\n    }\n\n    return url\n  }\n"],"names":["sanitizePrefix","getObjectFolder","data","originalDoc","source","safePrefix","prefix","safeObjectKey","_objectKey","getBeforeChangeHook","adapter","collection","disablePayloadAccessControl","generateFileURL","size","value","newFilename","sizes","name","filename","originalFilename","url","generateURL"],"mappings":"AAIA,SAASA,cAAc,QAAQ,iCAAgC;AAU/D,+DAA+D;AAC/D,MAAMC,kBAAkB,CAACC,MAAeC;IACtC,MAAMC,SAAUF,QAAQC,eAAe,CAAC;IACxC,MAAME,aAAaL,eAAe,OAAOI,OAAOE,MAAM,KAAK,WAAWF,OAAOE,MAAM,GAAG;IACtF,MAAMC,gBAAgBP,eACpB,OAAOI,OAAOI,UAAU,KAAK,WAAWJ,OAAOI,UAAU,GAAG;IAG9D,IAAIH,cAAcE,eAAe;QAC/B,OAAO,GAAGF,WAAW,CAAC,EAAEE,eAAe;IACzC;IAEA,OAAOF,cAAcE;AACvB;AAEA,OAAO,MAAME,sBACX,CAAC,EAAEC,OAAO,EAAEC,UAAU,EAAEC,2BAA2B,EAAEC,eAAe,EAAEC,IAAI,EAAQ,GAClF,OAAO,EAAEZ,IAAI,EAAEC,WAAW,EAAEY,KAAK,EAAE;QACjC,MAAMC,cAAcF,OAAOZ,MAAMe,OAAO,CAACH,KAAKI,IAAI,CAAC,EAAEC,WAAWjB,MAAMiB;QACtE,MAAMC,mBAAmBN,OACrBX,aAAac,OAAO,CAACH,KAAKI,IAAI,CAAC,EAAEC,WACjChB,aAAagB;QACjB,MAAMA,WAAWH,eAAeI;QAChC,MAAMd,SAASL,gBAAgBC,MAAMC;QACrC,IAAIkB,MAAMN;QAEV,IAAIF,mBAAmBM,UAAU;YAC/BE,MAAM,MAAMR,gBAAgB;gBAC1BF;gBACAQ;gBACAb;gBACAQ;YACF;QACF,OAAO,IAAIF,+BAA+BO,YAAYT,QAAQY,WAAW,EAAE;YACzED,MAAM,MAAMX,QAAQY,WAAW,CAAC;gBAC9BX;gBACAT,MAAMA,QAAQC;gBACdgB;gBACAb;YACF;QACF;QAEA,OAAOe;IACT,EAAC"}

package/dist/hooks/normalizeUploadPrefix.d.ts

@@ -0,0 +1,11 @@
+import type { CollectionBeforeChangeHook, FieldHook } from 'payload';
+type Args = {
+    collectionPrefix?: string;
+    useCompositePrefixes?: boolean;
+};
+/** Persist new upload destinations without reinterpreting metadata-only updates. */
+export declare const getNormalizeUploadPrefixHook: ({ collectionPrefix, useCompositePrefixes }: Args) => CollectionBeforeChangeHook;
+/** Run last on the prefix field so user hooks cannot leave stale storage coordinates. */
+export declare const getNormalizeUploadPrefixFieldHook: ({ collectionPrefix, useCompositePrefixes }: Args) => FieldHook;
+export {};
+//# sourceMappingURL=normalizeUploadPrefix.d.ts.map

package/dist/hooks/normalizeUploadPrefix.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalizeUploadPrefix.d.ts","sourceRoot":"","sources":["../../src/hooks/normalizeUploadPrefix.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAIpE,KAAK,IAAI,GAAG;IACV,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAiBD,oFAAoF;AACpF,eAAO,MAAM,4BAA4B,+CACM,IAAI,KAAG,0BAiBnD,CAAA;AAEH,yFAAyF;AACzF,eAAO,MAAM,iCAAiC,+CACC,IAAI,KAAG,SAenD,CAAA"}

package/dist/hooks/normalizeUploadPrefix.js

@@ -0,0 +1,42 @@
+import { buildUploadPrefix } from '../utilities/buildStoragePathData.js';
+/**
+ * A prefix the caller did not supply, or supplied unchanged, is left as stored so
+ * pre-upgrade files keep resolving to their original object keys. Anything the caller
+ * chooses is contained, because `prefix` is writable through the REST, GraphQL and
+ * Local APIs and the read path trusts whatever is persisted.
+ */ const isPrefixSupplied = ({ storedPrefix, value })=>typeof value === 'string' && value !== (typeof storedPrefix === 'string' ? storedPrefix : '');
+/** Persist new upload destinations without reinterpreting metadata-only updates. */ export const getNormalizeUploadPrefixHook = ({ collectionPrefix, useCompositePrefixes })=>({ data, originalDoc, req })=>{
+        if (req.context?.skipCloudStorage) {
+            return data;
+        }
+        if (!req.file && !isPrefixSupplied({
+            storedPrefix: originalDoc?.prefix,
+            value: data.prefix
+        })) {
+            return data;
+        }
+        data.prefix = buildUploadPrefix({
+            collectionPrefix,
+            docPrefix: typeof data.prefix === 'string' ? data.prefix : '',
+            useCompositePrefixes
+        }).sanitizedDocPrefix;
+        return data;
+    };
+/** Run last on the prefix field so user hooks cannot leave stale storage coordinates. */ export const getNormalizeUploadPrefixFieldHook = ({ collectionPrefix, useCompositePrefixes })=>({ previousValue, req, value })=>{
+        if (req.context?.skipCloudStorage) {
+            return value;
+        }
+        if (!req.file && !isPrefixSupplied({
+            storedPrefix: previousValue,
+            value
+        })) {
+            return value;
+        }
+        return buildUploadPrefix({
+            collectionPrefix,
+            docPrefix: typeof value === 'string' ? value : '',
+            useCompositePrefixes
+        }).sanitizedDocPrefix;
+    };
+
+//# sourceMappingURL=normalizeUploadPrefix.js.map

package/dist/hooks/normalizeUploadPrefix.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/hooks/normalizeUploadPrefix.ts"],"sourcesContent":["import type { CollectionBeforeChangeHook, FieldHook } from 'payload'\n\nimport { buildUploadPrefix } from '../utilities/buildStoragePathData.js'\n\ntype Args = {\n  collectionPrefix?: string\n  useCompositePrefixes?: boolean\n}\n\n/**\n * A prefix the caller did not supply, or supplied unchanged, is left as stored so\n * pre-upgrade files keep resolving to their original object keys. Anything the caller\n * chooses is contained, because `prefix` is writable through the REST, GraphQL and\n * Local APIs and the read path trusts whatever is persisted.\n */\nconst isPrefixSupplied = ({\n  storedPrefix,\n  value,\n}: {\n  storedPrefix: unknown\n  value: unknown\n}): boolean =>\n  typeof value === 'string' && value !== (typeof storedPrefix === 'string' ? storedPrefix : '')\n\n/** Persist new upload destinations without reinterpreting metadata-only updates. */\nexport const getNormalizeUploadPrefixHook =\n  ({ collectionPrefix, useCompositePrefixes }: Args): CollectionBeforeChangeHook =>\n  ({ data, originalDoc, req }) => {\n    if (req.context?.skipCloudStorage) {\n      return data\n    }\n\n    if (!req.file && !isPrefixSupplied({ storedPrefix: originalDoc?.prefix, value: data.prefix })) {\n      return data\n    }\n\n    data.prefix = buildUploadPrefix({\n      collectionPrefix,\n      docPrefix: typeof data.prefix === 'string' ? data.prefix : '',\n      useCompositePrefixes,\n    }).sanitizedDocPrefix\n\n    return data\n  }\n\n/** Run last on the prefix field so user hooks cannot leave stale storage coordinates. */\nexport const getNormalizeUploadPrefixFieldHook =\n  ({ collectionPrefix, useCompositePrefixes }: Args): FieldHook =>\n  ({ previousValue, req, value }) => {\n    if (req.context?.skipCloudStorage) {\n      return value\n    }\n\n    if (!req.file && !isPrefixSupplied({ storedPrefix: previousValue, value })) {\n      return value\n    }\n\n    return buildUploadPrefix({\n      collectionPrefix,\n      docPrefix: typeof value === 'string' ? value : '',\n      useCompositePrefixes,\n    }).sanitizedDocPrefix\n  }\n"],"names":["buildUploadPrefix","isPrefixSupplied","storedPrefix","value","getNormalizeUploadPrefixHook","collectionPrefix","useCompositePrefixes","data","originalDoc","req","context","skipCloudStorage","file","prefix","docPrefix","sanitizedDocPrefix","getNormalizeUploadPrefixFieldHook","previousValue"],"mappings":"AAEA,SAASA,iBAAiB,QAAQ,uCAAsC;AAOxE;;;;;CAKC,GACD,MAAMC,mBAAmB,CAAC,EACxBC,YAAY,EACZC,KAAK,EAIN,GACC,OAAOA,UAAU,YAAYA,UAAW,CAAA,OAAOD,iBAAiB,WAAWA,eAAe,EAAC;AAE7F,kFAAkF,GAClF,OAAO,MAAME,+BACX,CAAC,EAAEC,gBAAgB,EAAEC,oBAAoB,EAAQ,GACjD,CAAC,EAAEC,IAAI,EAAEC,WAAW,EAAEC,GAAG,EAAE;QACzB,IAAIA,IAAIC,OAAO,EAAEC,kBAAkB;YACjC,OAAOJ;QACT;QAEA,IAAI,CAACE,IAAIG,IAAI,IAAI,CAACX,iBAAiB;YAAEC,cAAcM,aAAaK;YAAQV,OAAOI,KAAKM,MAAM;QAAC,IAAI;YAC7F,OAAON;QACT;QAEAA,KAAKM,MAAM,GAAGb,kBAAkB;YAC9BK;YACAS,WAAW,OAAOP,KAAKM,MAAM,KAAK,WAAWN,KAAKM,MAAM,GAAG;YAC3DP;QACF,GAAGS,kBAAkB;QAErB,OAAOR;IACT,EAAC;AAEH,uFAAuF,GACvF,OAAO,MAAMS,oCACX,CAAC,EAAEX,gBAAgB,EAAEC,oBAAoB,EAAQ,GACjD,CAAC,EAAEW,aAAa,EAAER,GAAG,EAAEN,KAAK,EAAE;QAC5B,IAAIM,IAAIC,OAAO,EAAEC,kBAAkB;YACjC,OAAOR;QACT;QAEA,IAAI,CAACM,IAAIG,IAAI,IAAI,CAACX,iBAAiB;YAAEC,cAAce;YAAed;QAAM,IAAI;YAC1E,OAAOA;QACT;QAEA,OAAOH,kBAAkB;YACvBK;YACAS,WAAW,OAAOX,UAAU,WAAWA,QAAQ;YAC/CG;QACF,GAAGS,kBAAkB;IACvB,EAAC"}

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAErC,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,YAAY,CAAA;AAgBnE,eAAO,MAAM,kBAAkB,kBACb,aAAa,sBACZ,MAAM,KAAG,MA4NzB,CAAA"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAErC,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,YAAY,CAAA;AAiBnE,eAAO,MAAM,kBAAkB,kBACb,aAAa,sBACZ,MAAM,KAAG,MAwOzB,CAAA"}

package/dist/plugin.js

@@ -1,6 +1,7 @@
 import { getFields } from './fields/getFields.js';
 import { getAfterChangeHook } from './hooks/afterChange.js';
 import { getAfterDeleteHook } from './hooks/afterDelete.js';
+import { getNormalizeUploadPrefixHook } from './hooks/normalizeUploadPrefix.js';
 import { getPreserveFileDataHook } from './hooks/preserveFileData.js';
 // This plugin extends all targeted collections by offloading uploaded files
 // to cloud storage instead of solely storing files locally.
@@ -9,189 +10,197 @@ import { getPreserveFileDataHook } from './hooks/preserveFileData.js';
 // 1. handleUpload, 2. handleDelete, 3. generateURL, 4. staticHandler
 // Optionally, the adapter can specify any Webpack config overrides if they are necessary.
 export const cloudStoragePlugin = (pluginOptions)=>(incomingConfig)=>{
-        const { alwaysInsertFields, collections: allCollectionOptions, enabled, useCompositePrefixes } = pluginOptions;
+        const { collections: allCollectionOptions, enabled, useCompositePrefixes } = pluginOptions;
         const config = {
             ...incomingConfig
         };
-        // If disabled but alwaysInsertFields is true, only insert fields without full plugin functionality
+        // If disabled, only insert fields (e.g. prefix) without full plugin functionality,
+        // so the collection schema stays consistent across environments.
         if (enabled === false) {
-            if (alwaysInsertFields) {
-                return {
-                    ...config,
-                    collections: (config.collections || []).map((existingCollection)=>{
-                        const options = allCollectionOptions[existingCollection.slug];
-                        if (options) {
-                            // If adapter is provided, use it to get fields
-                            const adapter = options.adapter ? options.adapter({
-                                collection: existingCollection,
-                                prefix: options.prefix
-                            }) : undefined;
-                            const fields = getFields({
-                                adapter,
-                                alwaysInsertFields: true,
-                                collection: existingCollection,
-                                disablePayloadAccessControl: options.disablePayloadAccessControl,
-                                generateFileURL: options.generateFileURL,
-                                prefix: options.prefix,
-                                useCompositePrefixes
-                            });
-                            return {
-                                ...existingCollection,
-                                fields
-                            };
-                        }
-                        return existingCollection;
-                    })
-                };
-            }
-            return config;
+            return {
+                ...config,
+                collections: (config.collections || []).map((existingCollection)=>{
+                    const options = allCollectionOptions[existingCollection.slug];
+                    if (options) {
+                        // If adapter is provided, use it to get fields
+                        const adapter = options.adapter ? options.adapter({
+                            collection: existingCollection,
+                            prefix: options.prefix
+                        }) : undefined;
+                        const fields = getFields({
+                            adapter,
+                            collection: existingCollection,
+                            disablePayloadAccessControl: options.disablePayloadAccessControl,
+                            generateFileURL: options.generateFileURL,
+                            prefix: options.prefix,
+                            useCompositePrefixes
+                        });
+                        return {
+                            ...existingCollection,
+                            fields
+                        };
+                    }
+                    return existingCollection;
+                })
+            };
         }
         const initFunctions = [];
         const endpointPaths = new Map();
-        return {
-            ...config,
-            collections: (config.collections || []).map((existingCollection)=>{
-                const options = allCollectionOptions[existingCollection.slug];
-                if (options?.adapter) {
-                    const adapter = options.adapter({
-                        collection: existingCollection,
-                        prefix: options.prefix
-                    });
-                    if (adapter.onInit) {
-                        initFunctions.push(adapter.onInit);
+        const collections = (config.collections || []).map((existingCollection)=>{
+            const options = allCollectionOptions[existingCollection.slug];
+            if (options?.adapter) {
+                const adapter = options.adapter({
+                    collection: existingCollection,
+                    prefix: options.prefix
+                });
+                if (adapter.onInit) {
+                    initFunctions.push(adapter.onInit);
+                }
+                let uploadInstructions;
+                if (adapter.uploadInstructions) {
+                    const { adminHandler, enabled, endpoint, ...instructions } = adapter.uploadInstructions;
+                    let endpointPath = endpointPaths.get(options.adapter);
+                    if (enabled && endpoint && !endpointPath) {
+                        const endpointCount = config.endpoints?.filter(({ path })=>path?.startsWith(endpoint.path)).length || 0;
+                        endpointPath = endpointCount ? `${endpoint.path}-${endpointCount}` : endpoint.path;
+                        config.endpoints ??= [];
+                        config.endpoints.push({
+                            handler: endpoint.handler,
+                            method: 'post',
+                            path: endpointPath
+                        });
+                        endpointPaths.set(options.adapter, endpointPath);
                     }
-                    let uploadInstructions;
-                    if (adapter.uploadInstructions) {
-                        const { adminHandler, endpoint, ...instructions } = adapter.uploadInstructions;
-                        let endpointPath = endpointPaths.get(options.adapter);
-                        if (endpoint && !endpointPath) {
-                            const endpointCount = config.endpoints?.filter(({ path })=>path?.startsWith(endpoint.path)).length || 0;
-                            endpointPath = endpointCount ? `${endpoint.path}-${endpointCount}` : endpoint.path;
-                            config.endpoints ??= [];
-                            config.endpoints.push({
-                                handler: endpoint.handler,
-                                method: 'post',
-                                path: endpointPath
-                            });
-                            endpointPaths.set(options.adapter, endpointPath);
-                        }
-                        if (adminHandler) {
-                            config.admin ??= {};
-                            config.admin.components ??= {};
-                            config.admin.components.providers ??= [];
-                            config.admin.components.providers.push({
-                                clientProps: {
-                                    collectionSlug: existingCollection.slug,
-                                    endpointPath,
-                                    prefix: options.prefix,
-                                    props: adminHandler.props || {}
-                                },
-                                path: adminHandler.path
-                            });
-                        }
+                    if (enabled && adminHandler) {
+                        config.admin ??= {};
+                        config.admin.components ??= {};
+                        config.admin.components.providers ??= [];
+                        config.admin.components.providers.push({
+                            clientProps: {
+                                collectionSlug: existingCollection.slug,
+                                endpointPath,
+                                prefix: options.prefix,
+                                props: adminHandler.props || {}
+                            },
+                            path: adminHandler.path
+                        });
+                    }
+                    if (enabled) {
                         uploadInstructions = instructions;
+                    } else if (adminHandler) {
+                        /** Avoid importMap.js differences when client uploads vary between dev and production. */ config.admin ??= {};
+                        config.admin.dependencies ??= {};
+                        config.admin.dependencies[adminHandler.path] = {
+                            type: 'component',
+                            path: adminHandler.path
+                        };
                     }
-                    const fields = getFields({
-                        adapter,
-                        collection: existingCollection,
-                        disablePayloadAccessControl: options.disablePayloadAccessControl,
-                        generateFileURL: options.generateFileURL,
-                        prefix: options.prefix,
-                        useCompositePrefixes
+                }
+                const fields = getFields({
+                    adapter,
+                    collection: existingCollection,
+                    disablePayloadAccessControl: options.disablePayloadAccessControl,
+                    generateFileURL: options.generateFileURL,
+                    prefix: options.prefix,
+                    useCompositePrefixes
+                });
+                const handlers = [
+                    ...typeof existingCollection.upload === 'object' && Array.isArray(existingCollection.upload.handlers) ? existingCollection.upload.handlers : []
+                ];
+                if (!options.disablePayloadAccessControl) {
+                    handlers.push(adapter.staticHandler);
+                // Else if disablePayloadAccessControl: true and upload instructions are used
+                // Build the "proxied" handler that responds only when addDataAndFileToRequest fetches the uploaded file
+                } else if (uploadInstructions) {
+                    handlers.push((req, args)=>{
+                        if ('uploadReference' in args.params) {
+                            return adapter.staticHandler(req, args);
+                        }
                     });
-                    const handlers = [
-                        ...typeof existingCollection.upload === 'object' && Array.isArray(existingCollection.upload.handlers) ? existingCollection.upload.handlers : []
-                    ];
-                    if (!options.disablePayloadAccessControl) {
-                        handlers.push(adapter.staticHandler);
-                    // Else if disablePayloadAccessControl: true and upload instructions are used
-                    // Build the "proxied" handler that responds only when addDataAndFileToRequest fetches the uploaded file
-                    } else if (adapter.uploadInstructions) {
-                        handlers.push((req, args)=>{
-                            if ('directUpload' in args.params) {
-                                return adapter.staticHandler(req, args);
-                            }
+                }
+                const getSkipSafeFetchSetting = ()=>{
+                    const isBooleanTrueSkipSafeFetch = typeof existingCollection.upload === 'object' && existingCollection.upload.skipSafeFetch === true;
+                    const isAllowListSkipSafeFetch = typeof existingCollection.upload === 'object' && Array.isArray(existingCollection.upload.skipSafeFetch);
+                    if (isBooleanTrueSkipSafeFetch) {
+                        return true;
+                    } else if (isAllowListSkipSafeFetch) {
+                        const existingSkipSafeFetch = typeof existingCollection.upload === 'object' && Array.isArray(existingCollection.upload.skipSafeFetch) ? existingCollection.upload.skipSafeFetch : [];
+                        const hasExactLocalhostMatch = existingSkipSafeFetch.some((entry)=>{
+                            const entryKeys = Object.keys(entry);
+                            return entryKeys.length === 1 && entry.hostname === 'localhost';
                         });
+                        const localhostEntry = process.env.NODE_ENV !== 'production' && !hasExactLocalhostMatch ? [
+                            {
+                                hostname: 'localhost'
+                            }
+                        ] : [];
+                        return [
+                            ...existingSkipSafeFetch,
+                            ...localhostEntry
+                        ];
                     }
-                    const getSkipSafeFetchSetting = ()=>{
-                        if (options.disablePayloadAccessControl) {
-                            return true;
-                        }
-                        const isBooleanTrueSkipSafeFetch = typeof existingCollection.upload === 'object' && existingCollection.upload.skipSafeFetch === true;
-                        const isAllowListSkipSafeFetch = typeof existingCollection.upload === 'object' && Array.isArray(existingCollection.upload.skipSafeFetch);
-                        if (isBooleanTrueSkipSafeFetch) {
-                            return true;
-                        } else if (isAllowListSkipSafeFetch) {
-                            const existingSkipSafeFetch = typeof existingCollection.upload === 'object' && Array.isArray(existingCollection.upload.skipSafeFetch) ? existingCollection.upload.skipSafeFetch : [];
-                            const hasExactLocalhostMatch = existingSkipSafeFetch.some((entry)=>{
-                                const entryKeys = Object.keys(entry);
-                                return entryKeys.length === 1 && entry.hostname === 'localhost';
-                            });
-                            const localhostEntry = process.env.NODE_ENV !== 'production' && !hasExactLocalhostMatch ? [
-                                {
-                                    hostname: 'localhost'
-                                }
-                            ] : [];
-                            return [
-                                ...existingSkipSafeFetch,
-                                ...localhostEntry
-                            ];
-                        }
-                        if (process.env.NODE_ENV !== 'production') {
-                            return [
-                                {
-                                    hostname: 'localhost'
-                                }
-                            ];
-                        }
-                        return false;
-                    };
-                    return {
-                        ...existingCollection,
-                        fields,
-                        hooks: {
-                            ...existingCollection.hooks || {},
-                            afterChange: [
-                                ...existingCollection.hooks?.afterChange || [],
-                                getAfterChangeHook({
-                                    adapter,
-                                    collection: existingCollection
-                                })
-                            ],
-                            afterDelete: [
-                                ...existingCollection.hooks?.afterDelete || [],
-                                getAfterDeleteHook({
-                                    adapter,
-                                    collection: existingCollection
-                                })
-                            ],
-                            beforeChange: [
-                                ...existingCollection.hooks?.beforeChange || [],
-                                getPreserveFileDataHook()
-                            ]
+                    if (process.env.NODE_ENV !== 'production') {
+                        return [
+                            {
+                                hostname: 'localhost'
+                            }
+                        ];
+                    }
+                    return false;
+                };
+                return {
+                    ...existingCollection,
+                    fields,
+                    hooks: {
+                        ...existingCollection.hooks || {},
+                        afterChange: [
+                            ...existingCollection.hooks?.afterChange || [],
+                            getAfterChangeHook({
+                                adapter,
+                                collection: existingCollection,
+                                collectionPrefix: options.prefix,
+                                useCompositePrefixes
+                            })
+                        ],
+                        afterDelete: [
+                            ...existingCollection.hooks?.afterDelete || [],
+                            getAfterDeleteHook({
+                                adapter,
+                                collection: existingCollection,
+                                collectionPrefix: options.prefix,
+                                useCompositePrefixes
+                            })
+                        ],
+                        beforeChange: [
+                            ...existingCollection.hooks?.beforeChange || [],
+                            getNormalizeUploadPrefixHook({
+                                collectionPrefix: options.prefix,
+                                useCompositePrefixes
+                            }),
+                            getPreserveFileDataHook()
+                        ]
+                    },
+                    upload: {
+                        ...typeof existingCollection.upload === 'object' ? existingCollection.upload : {},
+                        adapter: adapter.name,
+                        ...uploadInstructions && {
+                            uploadInstructions
                         },
-                        upload: {
-                            ...typeof existingCollection.upload === 'object' ? existingCollection.upload : {},
-                            adapter: adapter.name,
-                            ...uploadInstructions && {
-                                uploadInstructions
-                            },
-                            disableLocalStorage: typeof options.disableLocalStorage === 'boolean' ? options.disableLocalStorage : true,
-                            handlers,
-                            skipSafeFetch: getSkipSafeFetchSetting()
-                        }
-                    };
-                }
-                return existingCollection;
-            }),
-            ...config.admin && {
-                admin: config.admin
-            },
-            ...config.endpoints && {
-                endpoints: config.endpoints
-            },
+                        disableLocalStorage: typeof options.disableLocalStorage === 'boolean' ? options.disableLocalStorage : true,
+                        handlers,
+                        skipSafeFetch: getSkipSafeFetchSetting()
+                    }
+                };
+            }
+            return existingCollection;
+        });
+        return {
+            ...config,
+            collections,
             onInit: async (payload)=>{
-                initFunctions.forEach((fn)=>fn());
+                // Await each init so a provisioning failure fails Payload startup
+                // instead of becoming an unhandled rejection.
+                await Promise.all(initFunctions.map((fn)=>fn()));
                 if (config.onInit) {
                     await config.onInit(payload);
                 }

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/plugin.ts"],"sourcesContent":["import type { Config } from 'payload'\n\nimport type { Adapter, AllowList, PluginOptions } from './types.js'\n\nimport { getFields } from './fields/getFields.js'\nimport { getAfterChangeHook } from './hooks/afterChange.js'\nimport { getAfterDeleteHook } from './hooks/afterDelete.js'\nimport { getPreserveFileDataHook } from './hooks/preserveFileData.js'\n\n// This plugin extends all targeted collections by offloading uploaded files\n// to cloud storage instead of solely storing files locally.\n\n// It is based on an adapter approach, where adapters can be written for any cloud provider.\n// Adapters are responsible for providing four actions that this plugin will use:\n// 1. handleUpload, 2. handleDelete, 3. generateURL, 4. staticHandler\n\n// Optionally, the adapter can specify any Webpack config overrides if they are necessary.\n\nexport const cloudStoragePlugin =\n  (pluginOptions: PluginOptions) =>\n  (incomingConfig: Config): Config => {\n    const {\n      alwaysInsertFields,\n      collections: allCollectionOptions,\n      enabled,\n      useCompositePrefixes,\n    } = pluginOptions\n    const config = { ...incomingConfig }\n\n    // If disabled but alwaysInsertFields is true, only insert fields without full plugin functionality\n    if (enabled === false) {\n      if (alwaysInsertFields) {\n        return {\n          ...config,\n          collections: (config.collections || []).map((existingCollection) => {\n            const options = allCollectionOptions[existingCollection.slug]\n\n            if (options) {\n              // If adapter is provided, use it to get fields\n              const adapter = options.adapter\n                ? options.adapter({\n                    collection: existingCollection,\n                    prefix: options.prefix,\n                  })\n                : undefined\n\n              const fields = getFields({\n                adapter,\n                alwaysInsertFields: true,\n                collection: existingCollection,\n                disablePayloadAccessControl: options.disablePayloadAccessControl,\n                generateFileURL: options.generateFileURL,\n                prefix: options.prefix,\n                useCompositePrefixes,\n              })\n\n              return {\n                ...existingCollection,\n                fields,\n              }\n            }\n\n            return existingCollection\n          }),\n        }\n      }\n\n      return config\n    }\n\n    const initFunctions: Array<() => void> = []\n    const endpointPaths = new Map<Adapter, string>()\n\n    return {\n      ...config,\n      collections: (config.collections || []).map((existingCollection) => {\n        const options = allCollectionOptions[existingCollection.slug]\n\n        if (options?.adapter) {\n          const adapter = options.adapter({\n            collection: existingCollection,\n            prefix: options.prefix,\n          })\n\n          if (adapter.onInit) {\n            initFunctions.push(adapter.onInit)\n          }\n\n          let uploadInstructions\n\n          if (adapter.uploadInstructions) {\n            const { adminHandler, endpoint, ...instructions } = adapter.uploadInstructions\n            let endpointPath = endpointPaths.get(options.adapter)\n\n            if (endpoint && !endpointPath) {\n              const endpointCount =\n                config.endpoints?.filter(({ path }) => path?.startsWith(endpoint.path)).length || 0\n\n              endpointPath = endpointCount ? `${endpoint.path}-${endpointCount}` : endpoint.path\n              config.endpoints ??= []\n              config.endpoints.push({\n                handler: endpoint.handler,\n                method: 'post',\n                path: endpointPath,\n              })\n              endpointPaths.set(options.adapter, endpointPath)\n            }\n\n            if (adminHandler) {\n              config.admin ??= {}\n              config.admin.components ??= {}\n              config.admin.components.providers ??= []\n              config.admin.components.providers.push({\n                clientProps: {\n                  collectionSlug: existingCollection.slug,\n                  endpointPath,\n                  prefix: options.prefix,\n                  props: adminHandler.props || {},\n                },\n                path: adminHandler.path,\n              })\n            }\n\n            uploadInstructions = instructions\n          }\n\n          const fields = getFields({\n            adapter,\n            collection: existingCollection,\n            disablePayloadAccessControl: options.disablePayloadAccessControl,\n            generateFileURL: options.generateFileURL,\n            prefix: options.prefix,\n            useCompositePrefixes,\n          })\n\n          const handlers = [\n            ...(typeof existingCollection.upload === 'object' &&\n            Array.isArray(existingCollection.upload.handlers)\n              ? existingCollection.upload.handlers\n              : []),\n          ]\n\n          if (!options.disablePayloadAccessControl) {\n            handlers.push(adapter.staticHandler)\n            // Else if disablePayloadAccessControl: true and upload instructions are used\n            // Build the \"proxied\" handler that responds only when addDataAndFileToRequest fetches the uploaded file\n          } else if (adapter.uploadInstructions) {\n            handlers.push((req, args) => {\n              if ('directUpload' in args.params) {\n                return adapter.staticHandler(req, args)\n              }\n            })\n          }\n\n          const getSkipSafeFetchSetting = (): AllowList | boolean => {\n            if (options.disablePayloadAccessControl) {\n              return true\n            }\n            const isBooleanTrueSkipSafeFetch =\n              typeof existingCollection.upload === 'object' &&\n              existingCollection.upload.skipSafeFetch === true\n\n            const isAllowListSkipSafeFetch =\n              typeof existingCollection.upload === 'object' &&\n              Array.isArray(existingCollection.upload.skipSafeFetch)\n\n            if (isBooleanTrueSkipSafeFetch) {\n              return true\n            } else if (isAllowListSkipSafeFetch) {\n              const existingSkipSafeFetch =\n                typeof existingCollection.upload === 'object' &&\n                Array.isArray(existingCollection.upload.skipSafeFetch)\n                  ? existingCollection.upload.skipSafeFetch\n                  : []\n\n              const hasExactLocalhostMatch = existingSkipSafeFetch.some((entry) => {\n                const entryKeys = Object.keys(entry)\n                return entryKeys.length === 1 && entry.hostname === 'localhost'\n              })\n\n              const localhostEntry =\n                process.env.NODE_ENV !== 'production' && !hasExactLocalhostMatch\n                  ? [{ hostname: 'localhost' }]\n                  : []\n\n              return [...existingSkipSafeFetch, ...localhostEntry]\n            }\n\n            if (process.env.NODE_ENV !== 'production') {\n              return [{ hostname: 'localhost' }]\n            }\n\n            return false\n          }\n\n          return {\n            ...existingCollection,\n            fields,\n            hooks: {\n              ...(existingCollection.hooks || {}),\n              afterChange: [\n                ...(existingCollection.hooks?.afterChange || []),\n                getAfterChangeHook({ adapter, collection: existingCollection }),\n              ],\n              afterDelete: [\n                ...(existingCollection.hooks?.afterDelete || []),\n                getAfterDeleteHook({ adapter, collection: existingCollection }),\n              ],\n              beforeChange: [\n                ...(existingCollection.hooks?.beforeChange || []),\n                getPreserveFileDataHook(),\n              ],\n            },\n            upload: {\n              ...(typeof existingCollection.upload === 'object' ? existingCollection.upload : {}),\n              adapter: adapter.name,\n              ...(uploadInstructions && {\n                uploadInstructions,\n              }),\n              disableLocalStorage:\n                typeof options.disableLocalStorage === 'boolean'\n                  ? options.disableLocalStorage\n                  : true,\n              handlers,\n              skipSafeFetch: getSkipSafeFetchSetting(),\n            },\n          }\n        }\n\n        return existingCollection\n      }),\n      ...(config.admin && { admin: config.admin }),\n      ...(config.endpoints && { endpoints: config.endpoints }),\n      onInit: async (payload) => {\n        initFunctions.forEach((fn) => fn())\n        if (config.onInit) {\n          await config.onInit(payload)\n        }\n      },\n    }\n  }\n"],"names":["getFields","getAfterChangeHook","getAfterDeleteHook","getPreserveFileDataHook","cloudStoragePlugin","pluginOptions","incomingConfig","alwaysInsertFields","collections","allCollectionOptions","enabled","useCompositePrefixes","config","map","existingCollection","options","slug","adapter","collection","prefix","undefined","fields","disablePayloadAccessControl","generateFileURL","initFunctions","endpointPaths","Map","onInit","push","uploadInstructions","adminHandler","endpoint","instructions","endpointPath","get","endpointCount","endpoints","filter","path","startsWith","length","handler","method","set","admin","components","providers","clientProps","collectionSlug","props","handlers","upload","Array","isArray","staticHandler","req","args","params","getSkipSafeFetchSetting","isBooleanTrueSkipSafeFetch","skipSafeFetch","isAllowListSkipSafeFetch","existingSkipSafeFetch","hasExactLocalhostMatch","some","entry","entryKeys","Object","keys","hostname","localhostEntry","process","env","NODE_ENV","hooks","afterChange","afterDelete","beforeChange","name","disableLocalStorage","payload","forEach","fn"],"mappings":"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"}
+{"version":3,"sources":["../src/plugin.ts"],"sourcesContent":["import type { Config } from 'payload'\n\nimport type { Adapter, AllowList, PluginOptions } from './types.js'\n\nimport { getFields } from './fields/getFields.js'\nimport { getAfterChangeHook } from './hooks/afterChange.js'\nimport { getAfterDeleteHook } from './hooks/afterDelete.js'\nimport { getNormalizeUploadPrefixHook } from './hooks/normalizeUploadPrefix.js'\nimport { getPreserveFileDataHook } from './hooks/preserveFileData.js'\n\n// This plugin extends all targeted collections by offloading uploaded files\n// to cloud storage instead of solely storing files locally.\n\n// It is based on an adapter approach, where adapters can be written for any cloud provider.\n// Adapters are responsible for providing four actions that this plugin will use:\n// 1. handleUpload, 2. handleDelete, 3. generateURL, 4. staticHandler\n\n// Optionally, the adapter can specify any Webpack config overrides if they are necessary.\n\nexport const cloudStoragePlugin =\n  (pluginOptions: PluginOptions) =>\n  (incomingConfig: Config): Config => {\n    const { collections: allCollectionOptions, enabled, useCompositePrefixes } = pluginOptions\n    const config = { ...incomingConfig }\n\n    // If disabled, only insert fields (e.g. prefix) without full plugin functionality,\n    // so the collection schema stays consistent across environments.\n    if (enabled === false) {\n      return {\n        ...config,\n        collections: (config.collections || []).map((existingCollection) => {\n          const options = allCollectionOptions[existingCollection.slug]\n\n          if (options) {\n            // If adapter is provided, use it to get fields\n            const adapter = options.adapter\n              ? options.adapter({\n                  collection: existingCollection,\n                  prefix: options.prefix,\n                })\n              : undefined\n\n            const fields = getFields({\n              adapter,\n              collection: existingCollection,\n              disablePayloadAccessControl: options.disablePayloadAccessControl,\n              generateFileURL: options.generateFileURL,\n              prefix: options.prefix,\n              useCompositePrefixes,\n            })\n\n            return {\n              ...existingCollection,\n              fields,\n            }\n          }\n\n          return existingCollection\n        }),\n      }\n    }\n\n    const initFunctions: Array<() => Promise<void> | void> = []\n    const endpointPaths = new Map<Adapter, string>()\n\n    const collections = (config.collections || []).map((existingCollection) => {\n      const options = allCollectionOptions[existingCollection.slug]\n\n      if (options?.adapter) {\n        const adapter = options.adapter({\n          collection: existingCollection,\n          prefix: options.prefix,\n        })\n\n        if (adapter.onInit) {\n          initFunctions.push(adapter.onInit)\n        }\n\n        let uploadInstructions\n\n        if (adapter.uploadInstructions) {\n          const { adminHandler, enabled, endpoint, ...instructions } = adapter.uploadInstructions\n          let endpointPath = endpointPaths.get(options.adapter)\n\n          if (enabled && endpoint && !endpointPath) {\n            const endpointCount =\n              config.endpoints?.filter(({ path }) => path?.startsWith(endpoint.path)).length || 0\n\n            endpointPath = endpointCount ? `${endpoint.path}-${endpointCount}` : endpoint.path\n            config.endpoints ??= []\n            config.endpoints.push({\n              handler: endpoint.handler,\n              method: 'post',\n              path: endpointPath,\n            })\n            endpointPaths.set(options.adapter, endpointPath)\n          }\n\n          if (enabled && adminHandler) {\n            config.admin ??= {}\n            config.admin.components ??= {}\n            config.admin.components.providers ??= []\n            config.admin.components.providers.push({\n              clientProps: {\n                collectionSlug: existingCollection.slug,\n                endpointPath,\n                prefix: options.prefix,\n                props: adminHandler.props || {},\n              },\n              path: adminHandler.path,\n            })\n          }\n\n          if (enabled) {\n            uploadInstructions = instructions\n          } else if (adminHandler) {\n            /** Avoid importMap.js differences when client uploads vary between dev and production. */\n            config.admin ??= {}\n            config.admin.dependencies ??= {}\n            config.admin.dependencies[adminHandler.path] = {\n              type: 'component',\n              path: adminHandler.path,\n            }\n          }\n        }\n\n        const fields = getFields({\n          adapter,\n          collection: existingCollection,\n          disablePayloadAccessControl: options.disablePayloadAccessControl,\n          generateFileURL: options.generateFileURL,\n          prefix: options.prefix,\n          useCompositePrefixes,\n        })\n\n        const handlers = [\n          ...(typeof existingCollection.upload === 'object' &&\n          Array.isArray(existingCollection.upload.handlers)\n            ? existingCollection.upload.handlers\n            : []),\n        ]\n\n        if (!options.disablePayloadAccessControl) {\n          handlers.push(adapter.staticHandler)\n          // Else if disablePayloadAccessControl: true and upload instructions are used\n          // Build the \"proxied\" handler that responds only when addDataAndFileToRequest fetches the uploaded file\n        } else if (uploadInstructions) {\n          handlers.push((req, args) => {\n            if ('uploadReference' in args.params) {\n              return adapter.staticHandler(req, args)\n            }\n          })\n        }\n\n        const getSkipSafeFetchSetting = (): AllowList | boolean => {\n          const isBooleanTrueSkipSafeFetch =\n            typeof existingCollection.upload === 'object' &&\n            existingCollection.upload.skipSafeFetch === true\n\n          const isAllowListSkipSafeFetch =\n            typeof existingCollection.upload === 'object' &&\n            Array.isArray(existingCollection.upload.skipSafeFetch)\n\n          if (isBooleanTrueSkipSafeFetch) {\n            return true\n          } else if (isAllowListSkipSafeFetch) {\n            const existingSkipSafeFetch =\n              typeof existingCollection.upload === 'object' &&\n              Array.isArray(existingCollection.upload.skipSafeFetch)\n                ? existingCollection.upload.skipSafeFetch\n                : []\n\n            const hasExactLocalhostMatch = existingSkipSafeFetch.some((entry) => {\n              const entryKeys = Object.keys(entry)\n              return entryKeys.length === 1 && entry.hostname === 'localhost'\n            })\n\n            const localhostEntry =\n              process.env.NODE_ENV !== 'production' && !hasExactLocalhostMatch\n                ? [{ hostname: 'localhost' }]\n                : []\n\n            return [...existingSkipSafeFetch, ...localhostEntry]\n          }\n\n          if (process.env.NODE_ENV !== 'production') {\n            return [{ hostname: 'localhost' }]\n          }\n\n          return false\n        }\n\n        return {\n          ...existingCollection,\n          fields,\n          hooks: {\n            ...(existingCollection.hooks || {}),\n            afterChange: [\n              ...(existingCollection.hooks?.afterChange || []),\n              getAfterChangeHook({\n                adapter,\n                collection: existingCollection,\n                collectionPrefix: options.prefix,\n                useCompositePrefixes,\n              }),\n            ],\n            afterDelete: [\n              ...(existingCollection.hooks?.afterDelete || []),\n              getAfterDeleteHook({\n                adapter,\n                collection: existingCollection,\n                collectionPrefix: options.prefix,\n                useCompositePrefixes,\n              }),\n            ],\n            beforeChange: [\n              ...(existingCollection.hooks?.beforeChange || []),\n              getNormalizeUploadPrefixHook({\n                collectionPrefix: options.prefix,\n                useCompositePrefixes,\n              }),\n              getPreserveFileDataHook(),\n            ],\n          },\n          upload: {\n            ...(typeof existingCollection.upload === 'object' ? existingCollection.upload : {}),\n            adapter: adapter.name,\n            ...(uploadInstructions && {\n              uploadInstructions,\n            }),\n            disableLocalStorage:\n              typeof options.disableLocalStorage === 'boolean' ? options.disableLocalStorage : true,\n            handlers,\n            skipSafeFetch: getSkipSafeFetchSetting(),\n          },\n        }\n      }\n\n      return existingCollection\n    })\n\n    return {\n      ...config,\n      collections,\n      onInit: async (payload) => {\n        // Await each init so a provisioning failure fails Payload startup\n        // instead of becoming an unhandled rejection.\n        await Promise.all(initFunctions.map((fn) => fn()))\n        if (config.onInit) {\n          await config.onInit(payload)\n        }\n      },\n    }\n  }\n"],"names":["getFields","getAfterChangeHook","getAfterDeleteHook","getNormalizeUploadPrefixHook","getPreserveFileDataHook","cloudStoragePlugin","pluginOptions","incomingConfig","collections","allCollectionOptions","enabled","useCompositePrefixes","config","map","existingCollection","options","slug","adapter","collection","prefix","undefined","fields","disablePayloadAccessControl","generateFileURL","initFunctions","endpointPaths","Map","onInit","push","uploadInstructions","adminHandler","endpoint","instructions","endpointPath","get","endpointCount","endpoints","filter","path","startsWith","length","handler","method","set","admin","components","providers","clientProps","collectionSlug","props","dependencies","type","handlers","upload","Array","isArray","staticHandler","req","args","params","getSkipSafeFetchSetting","isBooleanTrueSkipSafeFetch","skipSafeFetch","isAllowListSkipSafeFetch","existingSkipSafeFetch","hasExactLocalhostMatch","some","entry","entryKeys","Object","keys","hostname","localhostEntry","process","env","NODE_ENV","hooks","afterChange","collectionPrefix","afterDelete","beforeChange","name","disableLocalStorage","payload","Promise","all","fn"],"mappings":"AAIA,SAASA,SAAS,QAAQ,wBAAuB;AACjD,SAASC,kBAAkB,QAAQ,yBAAwB;AAC3D,SAASC,kBAAkB,QAAQ,yBAAwB;AAC3D,SAASC,4BAA4B,QAAQ,mCAAkC;AAC/E,SAASC,uBAAuB,QAAQ,8BAA6B;AAErE,4EAA4E;AAC5E,4DAA4D;AAE5D,4FAA4F;AAC5F,iFAAiF;AACjF,qEAAqE;AAErE,0FAA0F;AAE1F,OAAO,MAAMC,qBACX,CAACC,gBACD,CAACC;QACC,MAAM,EAAEC,aAAaC,oBAAoB,EAAEC,OAAO,EAAEC,oBAAoB,EAAE,GAAGL;QAC7E,MAAMM,SAAS;YAAE,GAAGL,cAAc;QAAC;QAEnC,mFAAmF;QACnF,iEAAiE;QACjE,IAAIG,YAAY,OAAO;YACrB,OAAO;gBACL,GAAGE,MAAM;gBACTJ,aAAa,AAACI,CAAAA,OAAOJ,WAAW,IAAI,EAAE,AAAD,EAAGK,GAAG,CAAC,CAACC;oBAC3C,MAAMC,UAAUN,oBAAoB,CAACK,mBAAmBE,IAAI,CAAC;oBAE7D,IAAID,SAAS;wBACX,+CAA+C;wBAC/C,MAAME,UAAUF,QAAQE,OAAO,GAC3BF,QAAQE,OAAO,CAAC;4BACdC,YAAYJ;4BACZK,QAAQJ,QAAQI,MAAM;wBACxB,KACAC;wBAEJ,MAAMC,SAASrB,UAAU;4BACvBiB;4BACAC,YAAYJ;4BACZQ,6BAA6BP,QAAQO,2BAA2B;4BAChEC,iBAAiBR,QAAQQ,eAAe;4BACxCJ,QAAQJ,QAAQI,MAAM;4BACtBR;wBACF;wBAEA,OAAO;4BACL,GAAGG,kBAAkB;4BACrBO;wBACF;oBACF;oBAEA,OAAOP;gBACT;YACF;QACF;QAEA,MAAMU,gBAAmD,EAAE;QAC3D,MAAMC,gBAAgB,IAAIC;QAE1B,MAAMlB,cAAc,AAACI,CAAAA,OAAOJ,WAAW,IAAI,EAAE,AAAD,EAAGK,GAAG,CAAC,CAACC;YAClD,MAAMC,UAAUN,oBAAoB,CAACK,mBAAmBE,IAAI,CAAC;YAE7D,IAAID,SAASE,SAAS;gBACpB,MAAMA,UAAUF,QAAQE,OAAO,CAAC;oBAC9BC,YAAYJ;oBACZK,QAAQJ,QAAQI,MAAM;gBACxB;gBAEA,IAAIF,QAAQU,MAAM,EAAE;oBAClBH,cAAcI,IAAI,CAACX,QAAQU,MAAM;gBACnC;gBAEA,IAAIE;gBAEJ,IAAIZ,QAAQY,kBAAkB,EAAE;oBAC9B,MAAM,EAAEC,YAAY,EAAEpB,OAAO,EAAEqB,QAAQ,EAAE,GAAGC,cAAc,GAAGf,QAAQY,kBAAkB;oBACvF,IAAII,eAAeR,cAAcS,GAAG,CAACnB,QAAQE,OAAO;oBAEpD,IAAIP,WAAWqB,YAAY,CAACE,cAAc;wBACxC,MAAME,gBACJvB,OAAOwB,SAAS,EAAEC,OAAO,CAAC,EAAEC,IAAI,EAAE,GAAKA,MAAMC,WAAWR,SAASO,IAAI,GAAGE,UAAU;wBAEpFP,eAAeE,gBAAgB,GAAGJ,SAASO,IAAI,CAAC,CAAC,EAAEH,eAAe,GAAGJ,SAASO,IAAI;wBAClF1B,OAAOwB,SAAS,KAAK,EAAE;wBACvBxB,OAAOwB,SAAS,CAACR,IAAI,CAAC;4BACpBa,SAASV,SAASU,OAAO;4BACzBC,QAAQ;4BACRJ,MAAML;wBACR;wBACAR,cAAckB,GAAG,CAAC5B,QAAQE,OAAO,EAAEgB;oBACrC;oBAEA,IAAIvB,WAAWoB,cAAc;wBAC3BlB,OAAOgC,KAAK,KAAK,CAAC;wBAClBhC,OAAOgC,KAAK,CAACC,UAAU,KAAK,CAAC;wBAC7BjC,OAAOgC,KAAK,CAACC,UAAU,CAACC,SAAS,KAAK,EAAE;wBACxClC,OAAOgC,KAAK,CAACC,UAAU,CAACC,SAAS,CAAClB,IAAI,CAAC;4BACrCmB,aAAa;gCACXC,gBAAgBlC,mBAAmBE,IAAI;gCACvCiB;gCACAd,QAAQJ,QAAQI,MAAM;gCACtB8B,OAAOnB,aAAamB,KAAK,IAAI,CAAC;4BAChC;4BACAX,MAAMR,aAAaQ,IAAI;wBACzB;oBACF;oBAEA,IAAI5B,SAAS;wBACXmB,qBAAqBG;oBACvB,OAAO,IAAIF,cAAc;wBACvB,wFAAwF,GACxFlB,OAAOgC,KAAK,KAAK,CAAC;wBAClBhC,OAAOgC,KAAK,CAACM,YAAY,KAAK,CAAC;wBAC/BtC,OAAOgC,KAAK,CAACM,YAAY,CAACpB,aAAaQ,IAAI,CAAC,GAAG;4BAC7Ca,MAAM;4BACNb,MAAMR,aAAaQ,IAAI;wBACzB;oBACF;gBACF;gBAEA,MAAMjB,SAASrB,UAAU;oBACvBiB;oBACAC,YAAYJ;oBACZQ,6BAA6BP,QAAQO,2BAA2B;oBAChEC,iBAAiBR,QAAQQ,eAAe;oBACxCJ,QAAQJ,QAAQI,MAAM;oBACtBR;gBACF;gBAEA,MAAMyC,WAAW;uBACX,OAAOtC,mBAAmBuC,MAAM,KAAK,YACzCC,MAAMC,OAAO,CAACzC,mBAAmBuC,MAAM,CAACD,QAAQ,IAC5CtC,mBAAmBuC,MAAM,CAACD,QAAQ,GAClC,EAAE;iBACP;gBAED,IAAI,CAACrC,QAAQO,2BAA2B,EAAE;oBACxC8B,SAASxB,IAAI,CAACX,QAAQuC,aAAa;gBACnC,6EAA6E;gBAC7E,wGAAwG;gBAC1G,OAAO,IAAI3B,oBAAoB;oBAC7BuB,SAASxB,IAAI,CAAC,CAAC6B,KAAKC;wBAClB,IAAI,qBAAqBA,KAAKC,MAAM,EAAE;4BACpC,OAAO1C,QAAQuC,aAAa,CAACC,KAAKC;wBACpC;oBACF;gBACF;gBAEA,MAAME,0BAA0B;oBAC9B,MAAMC,6BACJ,OAAO/C,mBAAmBuC,MAAM,KAAK,YACrCvC,mBAAmBuC,MAAM,CAACS,aAAa,KAAK;oBAE9C,MAAMC,2BACJ,OAAOjD,mBAAmBuC,MAAM,KAAK,YACrCC,MAAMC,OAAO,CAACzC,mBAAmBuC,MAAM,CAACS,aAAa;oBAEvD,IAAID,4BAA4B;wBAC9B,OAAO;oBACT,OAAO,IAAIE,0BAA0B;wBACnC,MAAMC,wBACJ,OAAOlD,mBAAmBuC,MAAM,KAAK,YACrCC,MAAMC,OAAO,CAACzC,mBAAmBuC,MAAM,CAACS,aAAa,IACjDhD,mBAAmBuC,MAAM,CAACS,aAAa,GACvC,EAAE;wBAER,MAAMG,yBAAyBD,sBAAsBE,IAAI,CAAC,CAACC;4BACzD,MAAMC,YAAYC,OAAOC,IAAI,CAACH;4BAC9B,OAAOC,UAAU5B,MAAM,KAAK,KAAK2B,MAAMI,QAAQ,KAAK;wBACtD;wBAEA,MAAMC,iBACJC,QAAQC,GAAG,CAACC,QAAQ,KAAK,gBAAgB,CAACV,yBACtC;4BAAC;gCAAEM,UAAU;4BAAY;yBAAE,GAC3B,EAAE;wBAER,OAAO;+BAAIP;+BAA0BQ;yBAAe;oBACtD;oBAEA,IAAIC,QAAQC,GAAG,CAACC,QAAQ,KAAK,cAAc;wBACzC,OAAO;4BAAC;gCAAEJ,UAAU;4BAAY;yBAAE;oBACpC;oBAEA,OAAO;gBACT;gBAEA,OAAO;oBACL,GAAGzD,kBAAkB;oBACrBO;oBACAuD,OAAO;wBACL,GAAI9D,mBAAmB8D,KAAK,IAAI,CAAC,CAAC;wBAClCC,aAAa;+BACP/D,mBAAmB8D,KAAK,EAAEC,eAAe,EAAE;4BAC/C5E,mBAAmB;gCACjBgB;gCACAC,YAAYJ;gCACZgE,kBAAkB/D,QAAQI,MAAM;gCAChCR;4BACF;yBACD;wBACDoE,aAAa;+BACPjE,mBAAmB8D,KAAK,EAAEG,eAAe,EAAE;4BAC/C7E,mBAAmB;gCACjBe;gCACAC,YAAYJ;gCACZgE,kBAAkB/D,QAAQI,MAAM;gCAChCR;4BACF;yBACD;wBACDqE,cAAc;+BACRlE,mBAAmB8D,KAAK,EAAEI,gBAAgB,EAAE;4BAChD7E,6BAA6B;gCAC3B2E,kBAAkB/D,QAAQI,MAAM;gCAChCR;4BACF;4BACAP;yBACD;oBACH;oBACAiD,QAAQ;wBACN,GAAI,OAAOvC,mBAAmBuC,MAAM,KAAK,WAAWvC,mBAAmBuC,MAAM,GAAG,CAAC,CAAC;wBAClFpC,SAASA,QAAQgE,IAAI;wBACrB,GAAIpD,sBAAsB;4BACxBA;wBACF,CAAC;wBACDqD,qBACE,OAAOnE,QAAQmE,mBAAmB,KAAK,YAAYnE,QAAQmE,mBAAmB,GAAG;wBACnF9B;wBACAU,eAAeF;oBACjB;gBACF;YACF;YAEA,OAAO9C;QACT;QAEA,OAAO;YACL,GAAGF,MAAM;YACTJ;YACAmB,QAAQ,OAAOwD;gBACb,kEAAkE;gBAClE,8CAA8C;gBAC9C,MAAMC,QAAQC,GAAG,CAAC7D,cAAcX,GAAG,CAAC,CAACyE,KAAOA;gBAC5C,IAAI1E,OAAOe,MAAM,EAAE;oBACjB,MAAMf,OAAOe,MAAM,CAACwD;gBACtB;YACF;QACF;IACF,EAAC"}