@shoper/cli 0.8.3-0 → 0.9.0

package/build/theme/class/browser/browser.js

@@ -18,7 +18,8 @@ export class Browser {
                 this.#onInfo?.(`Launching browser...`);
                 this.#browser = await puppeteer.launch({
                     headless: false,
-                    defaultViewport: null
+                    defaultViewport: null,
+                    args: process.platform === 'linux' ? ['--no-sandbox'] : []
                 });
                 this.#browser.on('disconnected', () => {
                     this.#onDisconnected?.('Browser disconnected');
@@ -69,6 +70,10 @@ export class Browser {
             throw error;
         }
     }
+    async refreshAll() {
+        const openTabs = this.getOpenTabs();
+        await Promise.allSettled(openTabs.map((tabId) => this.refresh(tabId)));
+    }
     async closeTab(tabId) {
         const tab = this.#tabs.get(tabId);
         if (!tab) {

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/features/theme/watch/service/theme_watch_service.js

@@ -2,7 +2,7 @@ import { AppLog } from '../../../../../cli/utilities/features/logger/logs/app_lo
 import chokidar from 'chokidar';
 import { APP_LOGS_TYPES } from '../../../../../cli/utilities/features/logger/logs/app_logs_constants.js';
 import { relative } from '../../../../../utils/path_utils.js';
-import { SHOP_BROWSER_TAB_ID, THEME_BATCH_DELAY_MS } from '../theme_watch_constants.js';
+import { SHOP_BROWSER_TAB_ID, STORE_FRONT_BROWSER_TAB_ID, THEME_BATCH_DELAY_MS } from '../theme_watch_constants.js';
 import { FILE_STATES } from '../../../../../utils/fs/fs_constants.js';
 export class ThemeWatchService {
     #themePushApi;
@@ -14,6 +14,7 @@ export class ThemeWatchService {
     #changedFiles = new Set();
     #watcher = null;
     #urlForWatchedTheme = null;
+    #storeFrontUrl = null;
     constructor({ themePushApi, browserClient }) {
         this.#themePushApi = themePushApi;
         this.#browserApi = new browserClient({
@@ -26,9 +27,11 @@ export class ThemeWatchService {
         this.#onMessage = onMessage || null;
         const themePath = executionContext.themeRootDir;
         this.#urlForWatchedTheme = `${credentials.shopUrl}/admin/configSkins/skin-preview/id/${executionContext.themeId}`;
+        this.#storeFrontUrl = credentials.shopUrl;
         if (openBrowser) {
             await this.#browserApi.launch();
             await this.#browserApi.openTab(this.#urlForWatchedTheme, SHOP_BROWSER_TAB_ID);
+            await this.#browserApi.openTab(this.#storeFrontUrl, STORE_FRONT_BROWSER_TAB_ID);
         }
         this._onInfoMessage(`Watching for changes in: ${themePath}`);
         this.#watcher = chokidar.watch(themePath, {
@@ -82,21 +85,30 @@ export class ThemeWatchService {
             .on('ready', () => this._onInfoMessage('Initial scan complete. Ready for changes.'));
     }
     async ensureBrowserTabOpen() {
-        if (!this.#urlForWatchedTheme)
+        if (!this.#urlForWatchedTheme || !this.#storeFrontUrl)
             return;
         if (!this.#browserApi.isBrowserOpen()) {
             this._onInfoMessage(`Browser is not open, launching...`);
             await this.#browserApi.launch();
             await this.#browserApi.openTab(this.#urlForWatchedTheme, SHOP_BROWSER_TAB_ID);
-            this._onInfoMessage(`Browser opened with new tab`);
+            await this.#browserApi.openTab(this.#storeFrontUrl, STORE_FRONT_BROWSER_TAB_ID);
+            this._onInfoMessage(`Browser opened with new tabs`);
             return;
         }
+        let reopened = false;
         if (!this.#browserApi.isTabOpen(SHOP_BROWSER_TAB_ID)) {
-            this._onInfoMessage(`Tab was closed, reopening...`);
+            this._onInfoMessage(`Admin preview tab was closed, reopening...`);
             await this.#browserApi.openTab(this.#urlForWatchedTheme, SHOP_BROWSER_TAB_ID);
-            return;
+            reopened = true;
+        }
+        if (!this.#browserApi.isTabOpen(STORE_FRONT_BROWSER_TAB_ID)) {
+            this._onInfoMessage(`Store front tab was closed, reopening...`);
+            await this.#browserApi.openTab(this.#storeFrontUrl, STORE_FRONT_BROWSER_TAB_ID);
+            reopened = true;
+        }
+        if (!reopened) {
+            this._onInfoMessage(`Browser and tabs already open`);
         }
-        this._onInfoMessage(`Browser and tab already open`);
     }
     async stopWatching() {
         this._onInfoMessage('Shutting down...');
@@ -105,6 +117,7 @@ export class ThemeWatchService {
         await this.#watcher?.close();
         await this.#browserApi.close();
         this.#urlForWatchedTheme = null;
+        this.#storeFrontUrl = null;
     }
     _clearQueuedBatch() {
         if (this.#batchTimeout) {
@@ -112,13 +125,14 @@ export class ThemeWatchService {
             this.#batchTimeout = null;
         }
     }
-    async _refreshBrowserTab() {
-        if (!SHOP_BROWSER_TAB_ID || !this.#browserApi.isTabOpen(SHOP_BROWSER_TAB_ID))
+    async _refreshBrowserTabs() {
+        const openTabs = this.#browserApi.getOpenTabs();
+        if (openTabs.length === 0)
             return;
         try {
-            this._onInfoMessage(`Refreshing browser tab...`);
-            await this.#browserApi.refresh(SHOP_BROWSER_TAB_ID);
-            this._onInfoMessage(`Browser tab refreshed`);
+            this._onInfoMessage(`Refreshing browser tabs...`);
+            await this.#browserApi.refreshAll();
+            this._onInfoMessage(`Browser tabs refreshed`);
         }
         catch (error) {
             this._onErrorMessage(`Error refreshing browser:`, error);
@@ -132,7 +146,7 @@ export class ThemeWatchService {
             this._onInfoMessage(`Pushing theme...`);
             await this.#themePushApi.partialPush(params);
             this._onSuccessMessage(`Theme pushed successfully`);
-            await this._refreshBrowserTab();
+            await this._refreshBrowserTabs();
             if (this.#pendingPush) {
                 this._onInfoMessage(`Executing queued push...`);
                 this.#isPushing = false;

package/build/theme/features/theme/watch/theme_watch_constants.js

@@ -2,3 +2,4 @@ export const THEME_WATCH_FEATURE_NAME = 'ThemeWatch';
 export const THEME_WATCH_API_NAME = 'ThemeWatchApi';
 export const THEME_BATCH_DELAY_MS = 750;
 export const SHOP_BROWSER_TAB_ID = 'shop-page';
+export const STORE_FRONT_BROWSER_TAB_ID = 'store-front';

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-0",
+    "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'
-];