@hubspot/local-dev-lib 3.16.0 → 3.16.1-beta.0

package/lib/cms/uploadFolder.js

@@ -38,6 +38,16 @@ function getFileType(filePath) {
             return files_1.FILE_TYPES.other;
     }
 }
+function isMetaJsonFile(filePath) {
+    return path_1.default.basename(filePath).toLowerCase() === 'meta.json';
+}
+function resolveUploadPath(file, fieldsJsPaths, tmpDirRegex, regex, dest) {
+    const fieldsJsFileInfo = fieldsJsPaths.find(f => f.outputPath === file);
+    const relativePath = file.replace(fieldsJsFileInfo ? tmpDirRegex : regex, '');
+    const destPath = (0, path_2.convertToUnixPath)(path_1.default.join(dest, relativePath));
+    const originalFilePath = fieldsJsFileInfo ? fieldsJsFileInfo.filePath : file;
+    return { fieldsJsFileInfo, relativePath, destPath, originalFilePath };
+}
 async function getFilesByType(filePaths, projectDir, rootWriteDir, commandOptions) {
     const { convertFields, fieldOptions } = commandOptions;
     const projectDirRegex = new RegExp(`^${(0, escapeRegExp_1.escapeRegExp)(projectDir)}`);
@@ -106,6 +116,12 @@ const defaultUploadFinalErrorCallback = (accountId, file, destPath, error) => {
         payload: file,
     });
 };
+async function uploadMetaJsonFiles(moduleFiles, uploadFile) {
+    const moduleMetaJsonFiles = moduleFiles.filter(isMetaJsonFile);
+    if (moduleMetaJsonFiles.length > 0) {
+        await queue.addAll(moduleMetaJsonFiles.map(uploadFile));
+    }
+}
 async function uploadFolder(accountId, src, dest, fileMapperOptions, commandOptions = {}, filePaths = [], cmsPublishMode = null) {
     const { saveOutput, convertFields, onAttemptCallback, onSuccessCallback, onFirstErrorCallback, onRetryCallback, onFinalErrorCallback, } = commandOptions;
     const _onAttemptCallback = onAttemptCallback || defaultUploadAttemptCallback;
@@ -120,23 +136,15 @@ async function uploadFolder(accountId, src, dest, fileMapperOptions, commandOpti
     const apiOptions = (0, fileMapper_1.getFileMapperQueryValues)(cmsPublishMode, fileMapperOptions);
     const failures = [];
     let fieldsJsPaths = [];
-    let tmpDirRegex;
+    const tmpDirRegex = new RegExp(`^${(0, escapeRegExp_1.escapeRegExp)(tmpDir || '')}`);
     const [filesByType, fieldsJsObjects] = await getFilesByType(filePaths, src, tmpDir, commandOptions);
-    const fileList = Object.values(filesByType);
     if (fieldsJsObjects.length) {
         fieldsJsPaths = fieldsJsObjects.map(fieldsJs => {
             return { outputPath: fieldsJs.outputPath, filePath: fieldsJs.filePath };
         });
-        tmpDirRegex = new RegExp(`^${(0, escapeRegExp_1.escapeRegExp)(tmpDir || '')}`);
     }
     function uploadFile(file) {
-        const fieldsJsFileInfo = fieldsJsPaths.find(f => f.outputPath === file);
-        const originalFilePath = fieldsJsFileInfo
-            ? fieldsJsFileInfo.filePath
-            : file;
-        // files in fieldsJsPaths always belong to the tmp directory.
-        const relativePath = file.replace(fieldsJsFileInfo ? tmpDirRegex : regex, '');
-        const destPath = (0, path_2.convertToUnixPath)(path_1.default.join(dest, relativePath));
+        const { originalFilePath, destPath } = resolveUploadPath(file, fieldsJsPaths, tmpDirRegex, regex, dest);
         return async () => {
             _onAttemptCallback(originalFilePath, destPath);
             try {
@@ -155,9 +163,23 @@ async function uploadFolder(accountId, src, dest, fileMapperOptions, commandOpti
             }
         };
     }
-    for (let i = 0; i < fileList.length; i++) {
-        const filesToUpload = fileList[i];
-        await queue.addAll(filesToUpload.map(uploadFile));
+    // Upload all meta.json files first
+    await uploadMetaJsonFiles(filesByType[files_1.FILE_TYPES.module] || [], uploadFile);
+    // Collect all remaining files for upload
+    const deferredFiles = [];
+    Object.entries(filesByType).forEach(([fileType, files]) => {
+        if (fileType === files_1.FILE_TYPES.module) {
+            // Add non-meta.json module files
+            deferredFiles.push(...files.filter(f => !isMetaJsonFile(f)));
+        }
+        else {
+            // Add all non-module files
+            deferredFiles.push(...files);
+        }
+    });
+    // Upload all remaining files concurrently
+    if (deferredFiles.length > 0) {
+        await queue.addAll(deferredFiles.map(uploadFile));
     }
     const results = await queue
         .addAll(failures.map(({ file, destPath }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "3.16.0",
+    "version": "3.16.1-beta.0",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "repository": {
         "type": "git",