@shoper/cli 0.5.2-1 → 0.5.2-2

package/build/theme/commands/push/theme_push_command.js

@@ -112,12 +112,12 @@ export class ThemePushCommand extends BaseThemeCommand {
                 themeFilesUploadApi
             });
             spinner.stop();
-            await promptConfirmation('Continue');
+            await promptConfirmation('Confirm');
             renderOnce(React.createElement(ThemePushedSuccess, { themeName: await ThemeInfoUtils.getThemeName(executionContext.themeRootDir) }));
         }
         catch (err) {
             spinner?.stop();
-            await promptConfirmation('Continue');
+            await promptConfirmation('Confirm');
             renderOnce(React.createElement(ThemeError, { err: err, executionContext: executionContext }));
         }
     }

package/build/theme/commands/ui/theme_error.js

@@ -19,8 +19,8 @@ export const ThemeError = ({ err, executionContext }) => {
         return React.createElement(ThemeWorkUrlMismatch, { command: "verify" });
     }
     if (err?.code === THEME_FILES_UPLOAD_ERROR) {
-        return (React.createElement(Error, { header: "Uploading theme files to the shop failed.\n" },
-            React.createElement(Text, null, "The rejected files have been removed locally. Please ensure that the files are not corrupted and that the file extensions are supported.")));
+        return (React.createElement(Error, { header: "Uploading theme files to the shop failed." },
+            React.createElement(Text, null, "Please ensure that the files are not corrupted and that the file extensions are supported.")));
     }
     if (err?.message) {
         return React.createElement(ValidationErrors, { errors: err.message });

package/build/theme/features/theme/push/service/theme_push_service.js

@@ -43,7 +43,9 @@ export class ThemePushService {
                     themeRootDir,
                     themeFilesUploadApi
                 });
-                localFileNameToUploaded = uploadData.localFileNameToUploaded;
+                if (!uploadData.isSuccess)
+                    throw ThemePushErrorsFactory.createErrorWhileUploadingThemeFiles(credentials.shopUrl);
+                localFileNameToUploaded = uploadData.localFileNameToUploadedMap;
             }
             const themeArchivePath = join(tmpDir, `${uuid()}.zip`);
             const filesInArchive = await ThemeActionsUtils.getFilesThatMatchesAction({
@@ -91,18 +93,19 @@ export class ThemePushService {
             await themeChecksums.updateAllChecksums();
         }
         catch (err) {
-            console.log('err', err);
             await ThemeFilesUtils.removeAFilesListFile(themeRootDir);
             throw err;
         }
     }
     async _uploadThemeFiles({ filesToUpload, themeRootDir, credentials, themeFilesUploadApi }) {
         try {
-            const { uploadedImageData } = await themeFilesUploadApi.uploadFiles(filesToUpload);
+            const { uploadedImageData, rejectedImageData } = await themeFilesUploadApi.uploadFiles(filesToUpload);
             if (uploadedImageData.length)
                 await ThemeImagesUtils.removeUploadedOriginalFiles(themeRootDir, uploadedImageData);
             return {
-                localFileNameToUploaded: uploadedImageData.reduce((acc, { originalFilename, uploadedFilename }) => {
+                isSuccess: rejectedImageData.length === 0,
+                rejectedImageData,
+                localFileNameToUploadedMap: uploadedImageData.reduce((acc, { originalFilename, uploadedFilename }) => {
                     return {
                         ...acc,
                         [originalFilename]: uploadedFilename ?? originalFilename
@@ -137,7 +140,10 @@ export class ThemePushService {
         return uniq(withSettingsFiles);
     }
     async _getAllModulesIds(themeRootDir) {
-        const moduleDirs = await getAllDirectoriesNamesInside(join(themeRootDir, MODULES_DIRECTORY_NAME));
+        const modulesPath = join(themeRootDir, MODULES_DIRECTORY_NAME);
+        if (!(await fileExists(modulesPath)))
+            return [];
+        const moduleDirs = await getAllDirectoriesNamesInside(modulesPath);
         const modulesIds = [];
         for (const moduleDir of moduleDirs) {
             const moduleSettingsPath = join(themeRootDir, MODULES_DIRECTORY_NAME, moduleDir, THEME_MODULE_SETTINGS_FILE_NAME);

package/build/theme/features/theme/utils/files/theme_files_utils.js

@@ -52,8 +52,6 @@ export class ThemeFilesUtils {
             }
             if (state === FILE_STATES.deleted)
                 return acc;
-            if (state === FILE_STATES.unchanged)
-                return acc;
             if (looksLikeDirectory(fileGlob)) {
                 const existingFiles = acc[fileGlob] || [];
                 return {

package/package.json

@@ -2,7 +2,7 @@
     "name": "@shoper/cli",
     "packageManager": "yarn@3.2.0",
     "sideEffects": false,
-    "version": "0.5.2-1",
+    "version": "0.5.2-2",
     "description": "CLI tool for Shoper",
     "author": "Joanna Firek",
     "license": "MIT",

package/build/cli/utilities/features/logger/logger_initializer.js

@@ -1,6 +0,0 @@
-// export class LoggerInitializer extends SyncFeatureInitializer {
-//     public initialize(): void {
-//         // this.feature.logger = new LoggerFeature(this.app);
-//     }
-// }
-export {};