From d47b753898085f5dc83f68f043e74ae5877c50c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Jablo=C3=B1ski?=
 <43938777+GermanJablo@users.noreply.github.com>
Date: Thu, 3 Apr 2025 10:06:25 -0300
Subject: [PATCH] chore(plugin-cloud-storage): enable TypeScript strict
 (#11850)

---
 packages/plugin-cloud-storage/src/admin/fields/getFields.ts  | 4 ++--
 packages/plugin-cloud-storage/src/fields/getFields.ts        | 4 ++--
 packages/plugin-cloud-storage/src/hooks/afterDelete.ts       | 4 +++-
 packages/plugin-cloud-storage/src/hooks/afterRead.ts         | 2 +-
 packages/plugin-cloud-storage/src/hooks/beforeChange.ts      | 2 +-
 packages/plugin-cloud-storage/src/plugin.ts                  | 3 ---
 .../plugin-cloud-storage/src/utilities/initClientUploads.ts  | 2 +-
 packages/plugin-cloud-storage/tsconfig.json                  | 5 -----
 8 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/packages/plugin-cloud-storage/src/admin/fields/getFields.ts b/packages/plugin-cloud-storage/src/admin/fields/getFields.ts
index 30f9070ee..ea58964b5 100644
--- a/packages/plugin-cloud-storage/src/admin/fields/getFields.ts
+++ b/packages/plugin-cloud-storage/src/admin/fields/getFields.ts
@@ -88,11 +88,11 @@ export const getFields = ({ collection, prefix }: Args): Field[] => {
           type: 'group',
           fields: [
             {
-              ...(existingSizeURLField || ({} as any)),
+              ...(existingSizeURLField || {}),
               ...baseURLField,
             },
           ],
-        }
+        } as Field
       }),
     }
 
diff --git a/packages/plugin-cloud-storage/src/fields/getFields.ts b/packages/plugin-cloud-storage/src/fields/getFields.ts
index 63c0b3662..acfe138ed 100644
--- a/packages/plugin-cloud-storage/src/fields/getFields.ts
+++ b/packages/plugin-cloud-storage/src/fields/getFields.ts
@@ -108,7 +108,7 @@ export const getFields = ({
           fields: [
             ...(adapter.fields || []),
             {
-              ...(existingSizeURLField || ({} as any)),
+              ...(existingSizeURLField || {}),
               ...baseURLField,
               hooks: {
                 afterRead: [
@@ -124,7 +124,7 @@ export const getFields = ({
               },
             },
           ],
-        }
+        } as Field
       }),
     }
 
diff --git a/packages/plugin-cloud-storage/src/hooks/afterDelete.ts b/packages/plugin-cloud-storage/src/hooks/afterDelete.ts
index 4e63a7a0b..9eefb7050 100644
--- a/packages/plugin-cloud-storage/src/hooks/afterDelete.ts
+++ b/packages/plugin-cloud-storage/src/hooks/afterDelete.ts
@@ -15,7 +15,9 @@ export const getAfterDeleteHook = ({
     try {
       const filesToDelete: string[] = [
         doc.filename,
-        ...Object.values(doc?.sizes || []).map((resizedFileData) => resizedFileData?.filename),
+        ...Object.values(doc?.sizes || []).map(
+          (resizedFileData) => resizedFileData?.filename as string,
+        ),
       ]
 
       const promises = filesToDelete.map(async (filename) => {
diff --git a/packages/plugin-cloud-storage/src/hooks/afterRead.ts b/packages/plugin-cloud-storage/src/hooks/afterRead.ts
index 7e83fa564..6fdf96188 100644
--- a/packages/plugin-cloud-storage/src/hooks/afterRead.ts
+++ b/packages/plugin-cloud-storage/src/hooks/afterRead.ts
@@ -18,7 +18,7 @@ export const getAfterReadHook =
     let url = value
 
     if (disablePayloadAccessControl && filename) {
-      url = await adapter.generateURL({
+      url = await adapter.generateURL?.({
         collection,
         data,
         filename,
diff --git a/packages/plugin-cloud-storage/src/hooks/beforeChange.ts b/packages/plugin-cloud-storage/src/hooks/beforeChange.ts
index 0503ba5b0..c2aa74484 100644
--- a/packages/plugin-cloud-storage/src/hooks/beforeChange.ts
+++ b/packages/plugin-cloud-storage/src/hooks/beforeChange.ts
@@ -29,7 +29,7 @@ export const getBeforeChangeHook =
           if (typeof originalDoc.sizes === 'object') {
             filesToDelete = filesToDelete.concat(
               Object.values(originalDoc?.sizes || []).map(
-                (resizedFileData) => resizedFileData?.filename,
+                (resizedFileData) => resizedFileData?.filename as string,
               ),
             )
           }
diff --git a/packages/plugin-cloud-storage/src/plugin.ts b/packages/plugin-cloud-storage/src/plugin.ts
index ae789cc93..90b8daac2 100644
--- a/packages/plugin-cloud-storage/src/plugin.ts
+++ b/packages/plugin-cloud-storage/src/plugin.ts
@@ -67,9 +67,6 @@ export const cloudStoragePlugin =
               if ('clientUploadContext' in args.params) {
                 return adapter.staticHandler(req, args)
               }
-
-              // Otherwise still skip staticHandler
-              return null
             })
           }
 
diff --git a/packages/plugin-cloud-storage/src/utilities/initClientUploads.ts b/packages/plugin-cloud-storage/src/utilities/initClientUploads.ts
index 0fb0acec6..2062b2938 100644
--- a/packages/plugin-cloud-storage/src/utilities/initClientUploads.ts
+++ b/packages/plugin-cloud-storage/src/utilities/initClientUploads.ts
@@ -89,7 +89,7 @@ export const initClientUploads = <ExtraProps extends Record<string, unknown>, T>
       clientProps: {
         collectionSlug,
         enabled,
-        extra: extraClientHandlerProps ? extraClientHandlerProps(collection) : undefined,
+        extra: extraClientHandlerProps ? extraClientHandlerProps(collection!) : undefined,
         prefix,
         serverHandlerPath,
       },
diff --git a/packages/plugin-cloud-storage/tsconfig.json b/packages/plugin-cloud-storage/tsconfig.json
index 6c57b9f88..dd036fd84 100644
--- a/packages/plugin-cloud-storage/tsconfig.json
+++ b/packages/plugin-cloud-storage/tsconfig.json
@@ -1,9 +1,4 @@
 {
   "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    /* TODO: remove the following lines */
-    "strict": false,
-    "noUncheckedIndexedAccess": false,
-  },
   "references": [{ "path": "../payload" }, { "path": "../ui" }]
 }