@scandipwa/magento-scripts 1.14.1-alpha.1 → 1.14.1-alpha.12

package/lib/tasks/requirements/docker/running-status.js

@@ -0,0 +1,138 @@
+const KnownError = require('../../../errors/known-error');
+const { execAsyncSpawn } = require('../../../util/exec-async-command');
+const pathExists = require('../../../util/path-exists');
+const sleep = require('../../../util/sleep');
+const { systemctlControl } = require('../../../util/systemctl');
+
+const pathToDockerApplication = '/Applications/Docker.app';
+
+const getDockerVersion = () => execAsyncSpawn('docker version --format {{.Server.Version}}', {
+    withCode: true
+});
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ */
+const checkDockerStatusMacOS = () => ({
+    title: 'Checking Docker status on MacOS',
+    task: async (ctx, task) => {
+        const { result, code } = await getDockerVersion();
+
+        if (code !== 0) {
+            if (result.includes('Is the docker daemon running?') || result.includes('docker: command not found')) {
+                const dockerOpenAppConfirmation = await task.prompt({
+                    type: 'Confirm',
+                    message: 'Looks like Docker is not running, would you like us to open a Docker for Mac application and wait for it to start up?'
+                });
+
+                if (dockerOpenAppConfirmation && await pathExists(pathToDockerApplication)) {
+                    await execAsyncSpawn(`open ${pathToDockerApplication}`);
+                    let ready = false;
+                    let attempts = 0;
+                    while (!ready) {
+                        if (attempts > 24 && !ready) {
+                            throw new KnownError('Docker haven\'t started in 2 mins, exiting...');
+                        }
+                        try {
+                            const { code: startupCode } = await getDockerVersion();
+                            if (startupCode !== 0) {
+                                task.output = `Waiting for Docker to startup for ${attempts * 5} seconds...`;
+                                attempts++;
+                                await sleep(5000);
+                            } else {
+                                ready = true;
+                            }
+                        } catch (e) {
+                        //
+                        }
+                    }
+
+                    return;
+                }
+
+                task.skip('User skipped running Docker');
+            }
+        }
+    },
+    options: {
+        bottomBar: 10
+    }
+});
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ */
+const checkDockerStatusWSL = () => ({
+    title: 'Checking Docker status on Windows WSL',
+    task: async () => {
+        const { result, code } = await getDockerVersion();
+
+        if (code !== 0 && result.includes('Is the docker daemon running?')) {
+            throw new KnownError(`Docker is not running!
+
+Please open Docker Desktop application for Windows and make sure that Docker is running. Then you can try again!`);
+        }
+    }
+});
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ */
+const checkDockerStatusLinux = () => ({
+    title: 'Checking Docker status on Linux',
+    task: async (ctx, task) => {
+        const dockerService = systemctlControl('docker');
+
+        const isRunning = await dockerService.isRunning();
+        const isEnabled = await dockerService.isEnabled();
+
+        if (!isEnabled && !isRunning) {
+            const dockerStartConfirmation = await task.prompt({
+                type: 'Confirm',
+                message: `Looks like Docker is not enabled and not running, would you like to enable and run it?
+
+This action requires root privileges.`
+            });
+
+            if (dockerStartConfirmation) {
+                await dockerService.enableAndStart();
+
+                return;
+            }
+            task.skip('User skipped running Docker');
+        } else if (!isRunning) {
+            const dockerStartConfirmation = await task.prompt({
+                type: 'Confirm',
+                message: `Looks like Docker is not running, would you like to run it?
+
+This action requires root privileges.`
+            });
+
+            if (dockerStartConfirmation) {
+                await dockerService.start();
+
+                return;
+            }
+            task.skip('User skipped running Docker');
+        }
+    }
+});
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ */
+const checkDockerStatus = () => ({
+    title: 'Checking Docker status',
+    task: async (ctx, task) => {
+        if (ctx.platform === 'darwin') {
+            return task.newListr(checkDockerStatusMacOS());
+        }
+        if (!ctx.isWsl) {
+            return task.newListr(checkDockerStatusLinux());
+        }
+
+        return task.newListr(checkDockerStatusWSL());
+    }
+});
+
+module.exports = checkDockerStatus;

package/lib/tasks/requirements/docker/version.js

@@ -1,3 +1,4 @@
+const UnknownError = require('../../../errors/unknown-error');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
 
 /**
@@ -13,6 +14,8 @@ const getDockerVersion = () => ({
             const dockerVersion = result.split('').filter((c) => /[\d.]/i.test(c)).join('') || result;
 
             ctx.dockerVersion = dockerVersion;
+        } else {
+            throw new UnknownError(`Got unexpected result during Docker version retrieval!\n\n${ result }`);
         }
     }
 });

package/lib/tasks/requirements/index.js

@@ -4,6 +4,7 @@ const checkComposer = require('./composer');
 const checkDocker = require('./docker');
 const checkNodeVersion = require('./node-version');
 const checkPHPVersion = require('./php-version');
+const checkRosetta = require('./rosetta');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -13,17 +14,19 @@ const checkRequirements = () => ({
     task: (ctx, task) => task.newListr([
         // checking if user is on supported platform
         checkPlatform(),
+        // check if rosetta 2 is installed or not on m1 macs
+        checkRosetta(),
+        // check the Docker installation
+        checkDocker(),
+        // check for Node.js version
+        checkNodeVersion(),
         // check the PHPBrew installation
         checkPHPbrew(),
         // check installed PHP version
         checkPHPVersion(),
-        // check the Docker installation
-        checkDocker(),
         // check for COMPOSER_AUTH or auth.json
         // localAuthJson(),
-        checkComposer(),
-        // check for Node.js version
-        checkNodeVersion()
+        checkComposer()
     ], {
         concurrent: false,
         exitOnError: true,

package/lib/tasks/requirements/node-version.js

@@ -1,4 +1,5 @@
 const semver = require('semver');
+const KnownError = require('../../errors/known-error');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -9,7 +10,7 @@ const checkNodeVersion = () => ({
         const { node } = process.versions;
 
         if (!semver.gte(node, '12.0.0')) {
-            throw new Error(
+            throw new KnownError(
                 `Your Node.js version is out of date!
 You need to upgrade Node.js to at lease version 12 to work with this software!`
             );

package/lib/tasks/requirements/php-version.js

@@ -3,44 +3,45 @@ const fs = require('fs');
 const path = require('path');
 const semver = require('semver');
 const phpbrewConfig = require('../../config/phpbrew');
+const KnownError = require('../../errors/known-error');
+const UnknownError = require('../../errors/unknown-error');
 const { execAsyncSpawn } = require('../../util/exec-async-command');
+const { getBrewCommandSync } = require('../../util/get-brew-bin-path');
 const pathExists = require('../../util/path-exists');
 const compileOptions = require('../php/compile-options');
 
 const latestStablePHP74 = '7.4.27';
 const phpbrewPHPName = `php-${latestStablePHP74}-phpbrew`;
 
-const compileOptionsForPhp = {
-    linux: {
-        ...compileOptions.linux,
-        variants: [
-            '+default'
-        ],
-        extraOptions: []
-    },
-    darwin: {
-        ...compileOptions.darwin,
-        variants: [
-            '+default',
-            '+openssl=$(brew --prefix openssl@1.1)'
-        ],
-        extraOptions: []
-    }
-};
-
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
 const installPHPForPHPBrew = () => ({
     title: `Installing PHP ${latestStablePHP74} for PHPBrew...`,
     task: async (ctx, task) => {
+        const compileOptionsForPhp = {
+            linux: {
+                ...compileOptions.linux,
+                variants: [
+                    '+default'
+                ],
+                extraOptions: []
+            },
+            darwin: {
+                ...compileOptions.darwin,
+                variants: [
+                    '+default',
+                    `+openssl=$(${getBrewCommandSync({ native: false })} --prefix openssl@1.1)`
+                ],
+                extraOptions: []
+            }
+        };
         const platformCompileOptions = compileOptionsForPhp[process.platform];
 
         if (!await pathExists(path.join(phpbrewConfig.phpPath, `${phpbrewPHPName}`, 'bin'))) {
             const commandEnv = Object.entries(platformCompileOptions.env || {}).map(([key, value]) => `${key}="${value}"`).join(' ');
-
             // eslint-disable-next-line max-len
-            const compileCommand = `${commandEnv ? `${commandEnv} && ` : ''}phpbrew install -j ${platformCompileOptions.cpuCount} ${latestStablePHP74} as ${phpbrewPHPName} ${platformCompileOptions.variants.join(' ')}`;
+            const compileCommand = ` ${commandEnv ? `${commandEnv} && ` : ''}phpbrew install -j ${platformCompileOptions.cpuCount} ${latestStablePHP74} as ${phpbrewPHPName} ${platformCompileOptions.variants.join(' ')}`;
 
             try {
                 await execAsyncSpawn(
@@ -48,11 +49,12 @@ const installPHPForPHPBrew = () => ({
                     {
                         callback: (t) => {
                             task.output = t;
-                        }
+                        },
+                        useRosetta2: true
                     }
                 );
             } catch (e) {
-                throw new Error(
+                throw new KnownError(
                     `Failed to compile the required by PHPBrew PHP version.
 Tried compiling the PHP version ${ latestStablePHP74 }.
 Use your favorite search engine to resolve the issue.
@@ -79,10 +81,10 @@ export PHPBREW_PATH=${phpbrewConfig.homePath}/php/${phpbrewPHPName}/bin
                 }
             );
         } catch (e) {
-            throw new Error(`Something went wrong when trying to switch PHP to ${phpbrewPHPName}!\n\n${e}`);
+            throw new UnknownError(`Something went wrong when trying to switch PHP to ${phpbrewPHPName}!\n\n${e}`);
         }
 
-        throw new Error(`You will need to restart your terminal and run ${logger.style.command('start')} again.
+        throw new KnownError(`You will need to restart your terminal and run ${logger.style.command('start')} again.
 
 You can use keyboard shortcut ${logger.style.command('CTRL+D')} to close terminal.`);
     },
@@ -99,7 +101,7 @@ const checkPHPVersion = () => ({
     task: async (ctx, task) => {
         const phpVersionResponse = await execAsyncSpawn('php --version');
 
-        const phpVersionResponseResult = phpVersionResponse.match(/PHP\s(\d\.\d\.\d)/i);
+        const phpVersionResponseResult = phpVersionResponse.match(/PHP\s(\d+\.\d+\.\d+)/i);
 
         if (phpVersionResponseResult && phpVersionResponseResult.length > 0) {
             const phpVersion = phpVersionResponseResult[1];
@@ -123,6 +125,8 @@ To fix that we will build special PHP version that will be used by PHPBrew, plea
                     );
                 }
             }
+
+            task.title = `Using PHP version ${phpVersion} in system`;
         }
     }
 });

package/lib/tasks/requirements/phpbrew/index.js

@@ -1,4 +1,5 @@
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
+const KnownError = require('../../../errors/known-error');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const installPHPBrew = require('./install');
 const getPHPBrewVersion = require('./version');
@@ -32,7 +33,7 @@ Do you want to install it automatically?`
                 ]);
             }
 
-            throw new Error(
+            throw new KnownError(
                 `To install PHPBrew, you must first make sure the requirements are met.
 The requirements are available here: ${ logger.style.link('https://github.com/phpbrew/phpbrew/wiki/Requirement') }.
 Then, you can follow the installation instruction, here: ${ logger.style.link('https://phpbrew.github.io/phpbrew/#installation') }.

package/lib/tasks/requirements/phpbrew/install.js

@@ -5,6 +5,8 @@ const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const installDependenciesTask = require('../../../util/install-dependencies-task');
 const osPlatform = require('../../../util/os-platform');
+const KnownError = require('../../../errors/known-error');
+const { getBrewCommand } = require('../../../util/get-brew-bin-path');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
@@ -13,10 +15,20 @@ const installPHPBrewDependencies = () => ({
     title: 'Installing PHPBrew dependencies',
     task: async (ctx, task) => {
         if (process.platform === 'darwin') {
+            const installedDependencies = (await execAsyncSpawn(`${await getBrewCommand({ native: true })} list`)).split('\n');
+
+            const dependenciesToInstall = ['php', 'autoconf', 'pkg-config'].filter((dep) => !installedDependencies.includes(dep));
+
+            if (dependenciesToInstall.length === 0) {
+                task.skip();
+                return;
+            }
+
             return task.newListr(
                 installDependenciesTask({
                     platform: 'darwin',
-                    dependenciesToInstall: ['php', 'autoconf', 'pkg-config']
+                    dependenciesToInstall,
+                    useMacNativeEnvironment: true
                 })
             );
         }
@@ -167,7 +179,7 @@ When you ready, press select Yes and installation will continue.`
             });
 
             if (!continueInstall) {
-                throw new Error(`Add following string to your shells configuration file: ${logger.style.code('[[ -e ~/.phpbrew/bashrc ]] && source ~/.phpbrew/bashrc')}
+                throw new KnownError(`Add following string to your shells configuration file: ${logger.style.code('[[ -e ~/.phpbrew/bashrc ]] && source ~/.phpbrew/bashrc')}
 
 Then you can continue installation.`);
             }

package/lib/tasks/requirements/phpbrew/version.js

@@ -1,3 +1,4 @@
+const UnknownError = require('../../../errors/unknown-error');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const safeRegexExtract = require('../../../util/safe-regex-extract');
 
@@ -15,7 +16,7 @@ const getPHPBrewVersion = () => ({
                 string: result,
                 regex: /phpbrew - ([\d.]+)/i,
                 onNoMatch: () => {
-                    throw new Error(`No phpbrew version found in phpbrew version output!\n\n${result}`);
+                    throw new UnknownError(`No phpbrew version found in phpbrew version output!\n\n${result}`);
                 }
             });
 

package/lib/tasks/requirements/platform.js

@@ -6,9 +6,10 @@ const { platforms, darwinMinimalVersion } = require('../../config');
 const dependencyCheck = require('./dependency');
 const { getArch } = require('../../util/arch');
 const getIsWsl = require('../../util/is-wsl');
+const KnownError = require('../../errors/known-error');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
 const checkPlatform = () => ({
     title: 'Checking platform',
@@ -16,14 +17,14 @@ const checkPlatform = () => ({
         const currentPlatform = os.platform();
 
         if (!platforms.includes(currentPlatform)) {
-            throw new Error(
+            throw new KnownError(
                 `Your current OS platform is ${ logger.style.misc(currentPlatform) }.
                 Unfortunately, currently we only support ${ platforms.map((platform) => logger.style.misc(platform)).join(',') }.`
             );
         }
 
         if (macosVersion.isMacOS && !macosVersion.isGreaterThanOrEqualTo(darwinMinimalVersion)) {
-            throw new Error(
+            throw new KnownError(
                 'Please update your system!',
                 `MacOS bellow version ${ logger.style.misc(darwinMinimalVersion) } is not supported.`
             );
@@ -36,6 +37,7 @@ const checkPlatform = () => ({
 
         ctx.platform = currentPlatform;
         ctx.platformVersion = currentPlatform !== 'darwin' ? os.release() : macosVersion();
+        ctx.isArmMac = ctx.isArm && ctx.platform === 'darwin';
 
         const { manufacturer, brand, cores } = await systeminformation.cpu();
 

package/lib/tasks/requirements/rosetta.js

@@ -0,0 +1,32 @@
+const { execAsyncSpawn, execCommandTask } = require('../../util/exec-async-command');
+
+/**
+ * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const checkRosetta = () => ({
+    skip: (ctx) => !ctx.isArmMac,
+    task: async (ctx, task) => {
+        task.title = 'Checking Rosetta 2 status';
+
+        const { code } = await execAsyncSpawn('arch -x86_64 echo "test"', {
+            withCode: true
+        });
+
+        if (code === 1) {
+            task.output = 'Rosetta 2 is not installed, installing...';
+            return task.newListr(
+                execCommandTask('softwareupdate --install-rosetta --agree-to-license', {
+                    pipeInput: true,
+                    callback: (t) => {
+                        task.output = t;
+                    }
+                })
+            );
+        }
+    },
+    options: {
+        bottomBar: 10
+    }
+});
+
+module.exports = checkRosetta;

package/lib/tasks/start.js

@@ -30,6 +30,8 @@ const enableMagentoComposerPlugins = require('./magento/enable-magento-composer-
 const getIsWsl = require('../util/is-wsl');
 const checkForXDGOpen = require('../util/xdg-open-exists');
 const { getInstanceMetadata, constants: { WEB_LOCATION_TITLE } } = require('../util/instance-metadata');
+const validatePHPInstallation = require('./php/validate-php');
+const installSodiumExtension = require('./php/install-sodium');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
@@ -112,7 +114,9 @@ const configureProject = () => ({
                 exitOnError: true
             })
         },
+        installSodiumExtension(),
         configurePhp(),
+        validatePHPInstallation(),
         installPrestissimo(),
         installMagento(),
         enableMagentoComposerPlugins(),
@@ -127,6 +131,7 @@ const configureProject = () => ({
  */
 const finishProjectConfiguration = () => ({
     title: 'Finishing project configuration',
+    skip: ({ skipSetup }) => skipSetup,
     task: (ctx, task) => task.newListr([
         {
             skip: (ctx) => !ctx.importDb,
@@ -144,16 +149,10 @@ const finishProjectConfiguration = () => ({
                 });
             }
         },
-        {
-            title: 'Setting up themes',
-            skip: (ctx) => !ctx.magentoFirstInstall,
-            task: (subCtx, subTask) => subTask.newListr(
-                setupThemes()
-            )
-        }
+        setupThemes()
     ], {
         rendererOptions: {
-            collapse: true
+            collapse: false
         }
     })
 });
@@ -194,7 +193,7 @@ const start = () => ({
                     const instanceMetadata = getInstanceMetadata(ctx);
                     const locationOnTheWeb = instanceMetadata.frontend.find(({ title }) => title === WEB_LOCATION_TITLE);
 
-                    openBrowser(locationOnTheWeb.text);
+                    openBrowser(locationOnTheWeb.link);
                 },
                 options: {
                     showTimer: false

package/lib/tasks/status/index.js

@@ -6,6 +6,7 @@ const { version: packageVersion } = require('../../../package.json');
 const { getArchSync } = require('../../util/arch');
 const ConsoleBlock = require('../../util/console-block');
 const { getComposerVersion } = require('../composer');
+const { getInstanceMetadata } = require('../../util/instance-metadata');
 
 /**
  * @param {string} port
@@ -23,11 +24,8 @@ const parsePort = (port) => {
 
 const prettyStatus = async (ctx) => {
     const {
-        ports,
         config: {
-            magentoConfiguration,
             baseConfig,
-            overridenConfiguration: { host, ssl },
             php,
             composer
         },
@@ -91,7 +89,7 @@ const prettyStatus = async (ctx) => {
             .addLine(`Image: ${logger.style.file(container.image)}`)
             .addLine(`Network: ${logger.style.link(container.network)}`);
 
-        if (container.ports.length > 0) {
+        if (container.ports && container.ports.length > 0) {
             block.addLine('Port forwarding:');
             container.ports.forEach((port) => {
                 const { host, hostPort, containerPort } = parsePort(port);
@@ -107,15 +105,33 @@ const prettyStatus = async (ctx) => {
         }
     });
 
+    const instanceMetadata = getInstanceMetadata(ctx);
+
     block
         .addEmptyLine()
-        .addSeparator('Magento status')
-        .addEmptyLine()
-        .addLine(`Web location: ${logger.style.link(`${ssl.enabled ? 'https' : 'http'}://${host}${ports.app === 80 ? '' : `:${ports.app}`}/`)}`)
-        .addLine(`Magento Admin panel location: ${logger.style.link(`${ssl.enabled ? 'https' : 'http'}://${host}${ports.app === 80 ? '' : `:${ports.app}`}/${magentoConfiguration.adminuri}`)}`)
-        .addLine(`Magento Admin panel credentials: ${logger.style.misc(magentoConfiguration.user)} - ${logger.style.misc(magentoConfiguration.password)}`)
+        .addSeparator('Magento 2')
         .addEmptyLine();
 
+    block.addLine(logger.style.misc('Frontend'));
+    instanceMetadata.frontend.forEach(({ title, text }) => {
+        block.addLine(`  ${title}: ${text}`);
+    });
+
+    block.addEmptyLine();
+
+    block.addLine(logger.style.misc('Admin'));
+    instanceMetadata.admin.forEach(({ title, text }) => {
+        block.addLine(`  ${title}: ${text}`);
+    });
+    // block
+    //     .addEmptyLine()
+    //     .addSeparator('Magento status')
+    //     .addEmptyLine()
+    //     .addLine(`Web location: ${logger.style.link(`${ssl.enabled ? 'https' : 'http'}://${host}${ports.app === 80 ? '' : `:${ports.app}`}/`)}`)
+    //     .addLine(`Magento Admin panel location: ${logger.style.link(`${ssl.enabled ? 'https' : 'http'}://${host}${ports.app === 80 ? '' : `:${ports.app}`}/${magentoConfiguration.adminuri}`)}`)
+    //     .addLine(`Magento Admin panel credentials: ${logger.style.misc(magentoConfiguration.user)} - ${logger.style.misc(magentoConfiguration.password)}`)
+    //     .addEmptyLine();
+
     block.log();
 };
 

package/lib/tasks/theme/build-theme.js

@@ -1,7 +1,9 @@
 const path = require('path');
 const pathExists = require('../../util/path-exists');
 const { execAsyncSpawn } = require('../../util/exec-async-command');
-const shouldUseYarn = require('@scandipwa/scandipwa-dev-utils/should-use-yarn');
+const logger = require('@scandipwa/scandipwa-dev-utils/logger');
+const matchFilesystem = require('../../util/match-filesystem');
+const UnknownError = require('../../errors/unknown-error');
 
 /**
  * @type {(theme: import('../../../typings/theme').Theme) => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -13,15 +15,32 @@ const buildTheme = ({ themePath }) => ({
 
         if (!await pathExists(path.join(themePath, 'node_modules'))) {
             task.output = 'Installing theme dependencies';
-            await execAsyncSpawn(shouldUseYarn() ? 'yarn' : 'npm i', {
-                cwd: path.join(process.cwd(), themePath),
-                callback: !verbose ? undefined : (t) => {
-                    task.output = t;
-                }
-            });
+            const commandToInstallDependencies = await pathExists(path.join(themePath, 'package-lock.json'))
+                ? 'npm ci'
+                : 'npm i';
+
+            try {
+                await execAsyncSpawn(commandToInstallDependencies, {
+                    cwd: path.join(process.cwd(), themePath),
+                    callback: !verbose ? undefined : (t) => {
+                        task.output = t;
+                    }
+                });
+            } catch (e) {
+                throw new UnknownError(`We were unable to install theme dependencies in ${themePath} using ${logger.style.code(commandToInstallDependencies)} command!
+If you have ${logger.style.file('package-lock.json')} in theme directory make sure it's up to date with ${logger.style.file('package.json')} file content.`);
+            }
         }
 
-        if (await pathExists(path.join(themePath, 'magento', 'Magento_Theme'))) {
+        const magentoThemeDirPath = path.join(themePath, 'magento', 'Magento_Theme');
+        const isMagentoThemeDirMatching = await matchFilesystem(magentoThemeDirPath, {
+            templates: true,
+            web: [
+                'static'
+            ]
+        });
+
+        if (isMagentoThemeDirMatching) {
             task.skip();
             return;
         }

package/lib/tasks/theme/install-theme.js

@@ -1,24 +1,37 @@
+const path = require('path');
+const UnknownError = require('../../errors/unknown-error');
+const getJsonfileData = require('../../util/get-jsonfile-data');
 const runComposerCommand = require('../../util/run-composer');
 
 /**
  * @type {(theme: import('../../../typings/theme').Theme) => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
-const installTheme = ({ composerData }) => ({
+const installTheme = (theme) => ({
     title: 'Installing theme in composer.json',
-    task: async ({ magentoVersion, verbose = false }, task) => {
+    task: async (ctx, task) => {
+        const { magentoVersion, verbose = false } = ctx;
+        const composerJsonData = await getJsonfileData(path.join(process.cwd(), 'composer.json'));
+
+        if (composerJsonData.require[theme.composerData.name]) {
+            task.skip();
+            return;
+        }
+
         try {
-            await runComposerCommand(`require ${composerData.name}`, {
+            await runComposerCommand(`require ${theme.composerData.name}`, {
                 magentoVersion,
                 callback: !verbose ? undefined : (t) => {
                     task.output = t;
                 }
             });
         } catch (e) {
-            throw new Error(
+            throw new UnknownError(
                 `Unexpected error while installing theme.
-                See ERROR log below.\n\n${e}`
+See ERROR log below.\n\n${e}`
             );
         }
+
+        ctx.isSetupUpgradeNeeded = true;
     },
     options: {
         bottomBar: 10