fix(build): avoid Turbopack chunk collision with GCS path rename (#7593)

Author: waleedlatif1

apps/sim/lib/uploads/core/storage-client.ts

@@ -84,7 +84,9 @@ export async function getFileMetadata(
      * absence, because GCS answers a missing object and a missing bucket the same
      * way and only the caller's own bucket configuration separates them.
      */
-    const { getGcsObjectMetadata } = await import('@/lib/uploads/providers/gcs/client')
+    const { getGcsObjectMetadata } = await import(
+      '@/lib/uploads/providers/google-cloud-storage/client'
+    )
     return getGcsObjectMetadata(
       key,
       customConfig?.bucket ? { bucket: customConfig.bucket } : undefined

apps/sim/lib/uploads/core/storage-service.ts

@@ -11,7 +11,10 @@ import {
 } from '@/lib/uploads/config'
 import { LOCAL_UPLOAD_METADATA_SUFFIX } from '@/lib/uploads/core/storage-key'
 import type { AzureMultipartPart, BlobConfig } from '@/lib/uploads/providers/blob/types'
-import type { GcsConfig, GcsMultipartPart } from '@/lib/uploads/providers/gcs/types'
+import type {
+  GcsConfig,
+  GcsMultipartPart,
+} from '@/lib/uploads/providers/google-cloud-storage/types'
 import type { S3Config, S3MultipartPart } from '@/lib/uploads/providers/s3/types'
 import type {
   DeleteFileOptions,
@@ -208,7 +211,7 @@ export async function uploadFile(options: UploadFileOptions): Promise<FileInfo>
   }
 
   if (USE_GCS_STORAGE) {
-    const { uploadToGcs } = await import('@/lib/uploads/providers/gcs/client')
+    const { uploadToGcs } = await import('@/lib/uploads/providers/google-cloud-storage/client')
     const uploadResult = await uploadToGcs(
       file,
       keyToUse,
@@ -379,7 +382,7 @@ async function createGcsBackend(
     uploadGcsPart,
     completeGcsMultipartUpload,
     abortGcsMultipartUpload,
-  } = await import('@/lib/uploads/providers/gcs/client')
+  } = await import('@/lib/uploads/providers/google-cloud-storage/client')
   const { uploadId, key: uploadKey } = await initiateGcsMultipartUpload({
     fileName: key,
     contentType,
@@ -553,7 +556,9 @@ export async function downloadFile(options: DownloadFileOptions): Promise<Buffer
     }
 
     if (USE_GCS_STORAGE) {
-      const { downloadFromGcs } = await import('@/lib/uploads/providers/gcs/client')
+      const { downloadFromGcs } = await import(
+        '@/lib/uploads/providers/google-cloud-storage/client'
+      )
       const gcsConfig = createGcsConfig(config)
       return downloadFromGcs(key, gcsConfig, maxBytes, signal)
     }
@@ -611,7 +616,9 @@ export async function downloadFileStream(options: {
   }
 
   if (USE_GCS_STORAGE) {
-    const { downloadFromGcsStream } = await import('@/lib/uploads/providers/gcs/client')
+    const { downloadFromGcsStream } = await import(
+      '@/lib/uploads/providers/google-cloud-storage/client'
+    )
     return downloadFromGcsStream(key, createGcsConfig(config))
   }
 
@@ -641,7 +648,7 @@ export async function deleteFile(options: DeleteFileOptions): Promise<void> {
     }
 
     if (USE_GCS_STORAGE) {
-      const { deleteFromGcs } = await import('@/lib/uploads/providers/gcs/client')
+      const { deleteFromGcs } = await import('@/lib/uploads/providers/google-cloud-storage/client')
       return deleteFromGcs(key, createGcsConfig(config))
     }
   }
@@ -721,7 +728,7 @@ export async function headObject(
   }
 
   if (USE_GCS_STORAGE) {
-    const { headGcsObject } = await import('@/lib/uploads/providers/gcs/client')
+    const { headGcsObject } = await import('@/lib/uploads/providers/google-cloud-storage/client')
     return headGcsObject(key, createGcsConfig(config))
   }
 
@@ -759,7 +766,9 @@ export async function generatePresignedDownloadUrl(
   }
 
   if (USE_GCS_STORAGE) {
-    const { getPresignedUrlWithConfig } = await import('@/lib/uploads/providers/gcs/client')
+    const { getPresignedUrlWithConfig } = await import(
+      '@/lib/uploads/providers/google-cloud-storage/client'
+    )
     return getPresignedUrlWithConfig(key, createGcsConfig(config), expirationSeconds)
   }
 

…lib/uploads/providers/gcs/client.test.ts …ders/google-cloud-storage/client.test.tsapps/sim/lib/uploads/providers/gcs/client.test.ts renamed to apps/sim/lib/uploads/providers/google-cloud-storage/client.test.ts apps/sim/lib/uploads/providers/gcs/client.test.ts renamed to apps/sim/lib/uploads/providers/google-cloud-storage/client.test.ts

@@ -84,7 +84,7 @@ import {
   resetGcsClientForTesting,
   uploadGcsPart,
   uploadToGcs,
-} from '@/lib/uploads/providers/gcs/client'
+} from '@/lib/uploads/providers/google-cloud-storage/client'
 
 const mockFetch = vi.fn()
 

…/sim/lib/uploads/providers/gcs/client.ts …providers/google-cloud-storage/client.tsapps/sim/lib/uploads/providers/gcs/client.ts renamed to apps/sim/lib/uploads/providers/google-cloud-storage/client.ts apps/sim/lib/uploads/providers/gcs/client.ts renamed to apps/sim/lib/uploads/providers/google-cloud-storage/client.ts

@@ -14,7 +14,7 @@ import type {
   GcsMultipartPart,
   GcsMultipartUploadInit,
   GcsPartUploadUrl,
-} from '@/lib/uploads/providers/gcs/types'
+} from '@/lib/uploads/providers/google-cloud-storage/types'
 import type {
   FileInfo,
   MultipartCompletionPolicy,

…s/sim/lib/uploads/providers/gcs/types.ts …/providers/google-cloud-storage/types.tsapps/sim/lib/uploads/providers/gcs/types.ts renamed to apps/sim/lib/uploads/providers/google-cloud-storage/types.ts apps/sim/lib/uploads/providers/gcs/types.ts renamed to apps/sim/lib/uploads/providers/google-cloud-storage/types.ts

@@ -140,7 +140,9 @@ export async function initiateMultipartProviderUpload(params: {
     return { provider, providerUploadId: result.uploadId }
   }
   if (provider === 'gcs') {
-    const { initiateGcsMultipartUpload } = await import('@/lib/uploads/providers/gcs/client')
+    const { initiateGcsMultipartUpload } = await import(
+      '@/lib/uploads/providers/google-cloud-storage/client'
+    )
     const result = await initiateGcsMultipartUpload({
       fileName: params.fileName,
       contentType: params.contentType,
@@ -229,7 +231,9 @@ export async function createPutProviderTransfer(params: {
     })
     return { method: 'put', ...transfer, expiresAt: signedExpiresAt }
   }
-  const { getGcsPresignedUploadUrl } = await import('@/lib/uploads/providers/gcs/client')
+  const { getGcsPresignedUploadUrl } = await import(
+    '@/lib/uploads/providers/google-cloud-storage/client'
+  )
   const transfer = await getGcsPresignedUploadUrl(
     params.key,
     params.contentType,
@@ -307,7 +311,9 @@ export async function getMultipartProviderPartUrls(params: {
       expiresAt,
     }))
   }
-  const { getGcsMultipartPartUrls } = await import('@/lib/uploads/providers/gcs/client')
+  const { getGcsMultipartPartUrls } = await import(
+    '@/lib/uploads/providers/google-cloud-storage/client'
+  )
   const urls = await getGcsMultipartPartUrls(
     params.key,
     params.providerUploadId,
@@ -341,7 +347,9 @@ export async function listMultipartProviderParts(params: {
     const { listMultipartParts } = await import('@/lib/uploads/providers/blob/client')
     return listMultipartParts(params.key, createBlobConfig(config))
   }
-  const { listGcsMultipartParts } = await import('@/lib/uploads/providers/gcs/client')
+  const { listGcsMultipartParts } = await import(
+    '@/lib/uploads/providers/google-cloud-storage/client'
+  )
   return listGcsMultipartParts(params.key, params.providerUploadId, createGcsConfig(config))
 }
 
@@ -397,7 +405,9 @@ export async function completeMultipartProviderUpload(params: {
     )
     return
   }
-  const { completeGcsMultipartUpload } = await import('@/lib/uploads/providers/gcs/client')
+  const { completeGcsMultipartUpload } = await import(
+    '@/lib/uploads/providers/google-cloud-storage/client'
+  )
   await completeGcsMultipartUpload(
     params.key,
     params.providerUploadId,
@@ -425,8 +435,8 @@ export async function headProviderObject(params: {
         ? await import('@/lib/uploads/providers/blob/client').then(({ headBlobObject }) =>
             headBlobObject(params.key, createBlobConfig(config))
           )
-        : await import('@/lib/uploads/providers/gcs/client').then(({ headGcsObject }) =>
-            headGcsObject(params.key, createGcsConfig(config))
+        : await import('@/lib/uploads/providers/google-cloud-storage/client').then(
+            ({ headGcsObject }) => headGcsObject(params.key, createGcsConfig(config))
           )
   if (!head) return null
   if (!head.contentType || !head.uploadId || !head.version) {
@@ -469,7 +479,9 @@ export async function deleteProviderObjectVersion(params: {
     })
     return
   }
-  const { deleteGcsObjectVersion } = await import('@/lib/uploads/providers/gcs/client')
+  const { deleteGcsObjectVersion } = await import(
+    '@/lib/uploads/providers/google-cloud-storage/client'
+  )
   await deleteGcsObjectVersion({
     key: params.key,
     generation: params.version,
@@ -502,7 +514,9 @@ export async function abortProviderUpload(params: {
       const { abortMultipartUpload } = await import('@/lib/uploads/providers/blob/client')
       await abortMultipartUpload(params.key, params.uploadId, createBlobConfig(config))
     } else {
-      const { abortGcsMultipartUpload } = await import('@/lib/uploads/providers/gcs/client')
+      const { abortGcsMultipartUpload } = await import(
+        '@/lib/uploads/providers/google-cloud-storage/client'
+      )
       await abortGcsMultipartUpload(params.key, params.providerUploadId, createGcsConfig(config))
     }
   }