@shoper/cli 0.8.3-1 → 0.9.0

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

@@ -25,8 +25,6 @@ import { ThemeError } from '../ui/theme_error.js';
 import { mapToPermissionsTree } from '../../utils/directory_validator/directory_validator_utils.js';
 import { mapChecksumToTree } from '../../../utils/checksums/checksums_utils.js';
 import { ThemeUnpermittedActionsError } from './ui/theme_unpermitted_actions_error.js';
-import { validateThemeFolderStructure } from '../../utils/push_validators/push_path_validator_utils.js';
-import { ThemeInvalidFoldersError } from './ui/theme_invalid_folders_error.js';
 import { LOGGER_API_NAME } from '../../../cli/utilities/features/logger/logger_constants.js';
 export class ThemePushCommand extends BaseThemeCommand {
     static summary = 'Uploads your local theme files to the store and overwrites the current version of the theme in your store.';
@@ -88,11 +86,8 @@ export class ThemePushCommand extends BaseThemeCommand {
                 permissions: mapToPermissionsTree(permissions),
                 rootDirectory: executionContext.themeRootDir
             });
-            const folderStructureValidation = await validateThemeFolderStructure(executionContext.themeRootDir);
-            if (!folderStructureValidation.isValid) {
-                renderOnce(React.createElement(ThemeInvalidFoldersError, { invalidDirectories: folderStructureValidation.invalidDirectories }));
-                return;
-            }
+            //TODO jak wysyla folder z nazwa posiadajaco \ na windows, wychodzimy
+            //TODO validacja folderów przed pushem
             if (!validationResult.isValid) {
                 renderOnce(React.createElement(ThemeUnpermittedActionsError, { unpermittedActions: validationResult.unpermittedActions }));
                 return;

package/build/theme/hooks/themes_actions/ensure_themes_actions_hook_constants.js

@@ -3,5 +3,6 @@ export const THEME_COMMANDS_THAT_REQUIRED_ACTIONS_LIST = [
     THEME_COMMANDS_NAME.pull,
     THEME_COMMANDS_NAME.init,
     THEME_COMMANDS_NAME.push,
-    THEME_COMMANDS_NAME.delete
+    THEME_COMMANDS_NAME.delete,
+    THEME_COMMANDS_NAME.watch
 ];

package/build/utils/zip/create_zip_utils.js

@@ -5,7 +5,7 @@ import { createWriteStream } from 'node:fs';
 import { StreamReadError } from '../fs/errors/stream_read_error.js';
 import { CreateZipError } from './errors/create_zip_error.js';
 import { StreamWriteError } from '../fs/errors/stream_write_error.js';
-import { join, toUnixPath } from '../path_utils.js';
+import { join } from '../path_utils.js';
 import { AppError } from '../../cli/utilities/features/logger/logs/app_error.js';
 export const createZip = async ({ files, dist, baseDir = process.cwd(), logger }) => {
     const zipfile = new yazl.ZipFile();
@@ -29,14 +29,14 @@ export const createZip = async ({ files, dist, baseDir = process.cwd(), logger }
                     code: 'FILE_NOT_FOUND',
                     details: { file, baseDir }
                 });
-            const zipEntryName = toUnixPath(file);
             if (await isDirectory(fullPath)) {
-                logger.debug('Adding empty directory to zip', { details: { directory: zipEntryName } });
-                zipfile.addEmptyDirectory(zipEntryName);
+                logger.debug('Adding empty directory to zip', { details: { directory: file } });
+                zipfile.addEmptyDirectory(file);
             }
             else {
-                logger.debug('Adding file to zip', { details: { file: zipEntryName, fullPath } });
-                zipfile.addFile(fullPath, zipEntryName, {
+                logger.debug('Adding file to zip', { details: { file, fullPath } });
+                zipfile.addFile(fullPath, file, {
+                    //TODO params
                     compress: true
                 });
             }

package/package.json

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

package/build/theme/commands/push/ui/theme_invalid_folders_error.js

@@ -1,16 +0,0 @@
-import { List } from '../../../../ui/list/list.js';
-import { Error } from '../../../../ui/message_box/error.js';
-import { Text } from '../../../../ui/text.js';
-import React from 'react';
-import { ALLOWED_THEME_TOP_LEVEL_DIRECTORIES } from '../../../utils/push_validators/push_validator_constants.js';
-export const ThemeInvalidFoldersError = ({ invalidDirectories }) => {
-    const items = invalidDirectories.map((dir) => ({
-        content: dir
-    }));
-    return (React.createElement(Error, { header: "Invalid theme folder structure" },
-        React.createElement(Text, null, "The following directories are not allowed in the theme root:"),
-        React.createElement(List, { items: items }),
-        React.createElement(Text, null,
-            "Allowed top-level directories: ",
-            ALLOWED_THEME_TOP_LEVEL_DIRECTORIES.join(', '))));
-};

package/build/theme/utils/push_validators/push_path_validator_utils.js

@@ -1,16 +0,0 @@
-import { getAllDirectoriesNamesInside } from '../../../utils/fs/fs_utils.js';
-import { ALLOWED_THEME_TOP_LEVEL_DIRECTORIES } from './push_validator_constants.js';
-export const validateThemeFolderStructure = async (themeRootDir) => {
-    const directories = await getAllDirectoriesNamesInside(themeRootDir, { recursive: false, hidden: true });
-    const allowedSet = new Set(ALLOWED_THEME_TOP_LEVEL_DIRECTORIES);
-    const invalidDirectories = directories.filter((dir) => {
-        if (dir.startsWith('.') && !allowedSet.has(dir)) {
-            return false;
-        }
-        return !allowedSet.has(dir);
-    });
-    return {
-        isValid: invalidDirectories.length === 0,
-        invalidDirectories
-    };
-};

package/build/theme/utils/push_validators/push_validator_constants.js

@@ -1,8 +0,0 @@
-export const ALLOWED_THEME_TOP_LEVEL_DIRECTORIES = [
-    '.shoper',
-    'settings',
-    'styles',
-    'macros',
-    'modules',
-    'skinstore'
-];