@scandipwa/magento-scripts 1.15.6 → 1.15.7

package/lib/config/dependencies-for-platforms.js

@@ -20,6 +20,16 @@ const dependenciesForPlatforms = {
         installCommand: (deps, { native } = { native: false }) => `${getBrewCommandSync({ native })} install ${deps}`,
         packageManager: 'brew'
     },
+    'darwin-arm': {
+        dependencies: [
+            'php',
+            'autoconf',
+            'pkg-config',
+            'gd'
+        ],
+        installCommand: (deps, { native } = { native: false }) => `${getBrewCommandSync({ native })} install ${deps}`,
+        packageManager: 'brew'
+    },
     'Arch Linux': {
         dependencies: [
             'freetype2',
@@ -36,7 +46,9 @@ const dependenciesForPlatforms = {
             'sqlite',
             'readline',
             'perl',
-            'libsodium'
+            'libsodium',
+            'php',
+            'pkgconf'
         ],
         installCommand: (deps) => `sudo pacman -S ${deps} --noconfirm`,
         packageManager: 'pacman'
@@ -58,7 +70,8 @@ const dependenciesForPlatforms = {
             'bzip2-devel',
             'curl-devel',
             'libxslt-devel',
-            'autoconf'
+            'autoconf',
+            'php'
         ],
         installCommand: (deps) => `sudo yum install ${deps} -y`,
         packageManager: 'yum'
@@ -80,7 +93,8 @@ const dependenciesForPlatforms = {
             'bzip2-devel',
             'curl-devel',
             'libxslt-devel',
-            'autoconf'
+            'autoconf',
+            'php'
         ],
         installCommand: (deps) => `sudo yum install --enablerepo=PowerTools ${deps} -y`,
         packageManager: 'yum'
@@ -109,7 +123,8 @@ const dependenciesForPlatforms = {
             'php-bz2',
             'pkg-config',
             'autoconf',
-            'cmake'
+            'cmake',
+            'php'
         ],
         installCommand: (deps) => `sudo apt install ${deps} -y`,
         packageManager: 'apt'

package/lib/config/php-config.js

@@ -17,8 +17,8 @@ module.exports = (app, config) => {
         binPath: path.join(phpVersionDir, 'bin', 'php'),
         iniPath: path.join(cacheDir, 'php.ini'),
         iniTemplatePath: php.configTemplate,
-        fpmBinPath: path.resolve(phpVersionDir, 'sbin', 'php-fpm'),
-        fpmConfPath: path.resolve(cacheDir, 'php-fpm.conf'),
+        fpmBinPath: path.join(phpVersionDir, 'sbin', 'php-fpm'),
+        fpmConfPath: path.join(cacheDir, 'php-fpm.conf'),
         fpmPidFilePath: path.join(cacheDir, 'php-fpm.pid'),
         extensions: php.extensions,
         version: php.version

package/lib/config/templates/ssl-terminator.template.conf

@@ -21,6 +21,12 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header Host $http_host;
+        proxy_http_version 1.1;
+        proxy_set_header Connection "";
+        proxy_connect_timeout       300;
+        proxy_send_timeout          300;
+        proxy_read_timeout          300;
+        send_timeout                300;
 
         proxy_pass http://<%= it.hostMachine %>:<% if (it.config.configuration.varnish.enabled) { %><%= it.ports.varnish %><% } else { %><%= it.ports.app %><% } %>;
     }

package/lib/tasks/file-system/create-ssl-terminator-config.js

@@ -38,9 +38,9 @@ const createSSLTerminatorConfig = () => ({
                 throw new KnownError('ssl.ssl_certificate_key file does not exist!');
             }
 
-            const nginxCacheDir = path.join(baseConfig.cacheDir, 'nginx', 'conf.d');
-            if (!await pathExists(nginxCacheDir)) {
-                await fs.promises.mkdir(nginxCacheDir, { recursive: true });
+            const sslTerminatorCacheDir = path.join(baseConfig.cacheDir, 'ssl-terminator', 'conf.d');
+            if (!await pathExists(sslTerminatorCacheDir)) {
+                await fs.promises.mkdir(sslTerminatorCacheDir, { recursive: true });
             }
 
             await fs.promises.copyFile(

package/lib/tasks/import-dump.js

@@ -31,12 +31,20 @@ const importDump = () => ({
         configureProject(),
         {
             title: 'Installing Magento',
-            // skip setup if env.php and config.php are present in app/etc folder
-            skip: () => matchFilesystem(path.resolve('app/etc'), ['config.php', 'env.php']),
+            // skip setup if env.php and config.php are present in app/etc folder and db is not empty
+            skip: async (ctx) => {
+                const isFsMatching = await matchFilesystem(path.join(process.cwd(), 'app', 'etc'), ['config.php', 'env.php']);
+                const { mysqlConnection } = ctx;
+                const [[{ tableCount }]] = await mysqlConnection.query(`
+                    SELECT count(*) AS tableCount
+                    FROM INFORMATION_SCHEMA.TABLES
+                    WHERE TABLE_SCHEMA = 'magento';
+                `);
+
+                return tableCount !== 0 || !isFsMatching;
+            },
             task: (subCtx, subTask) => subTask.newListr(
-                setupMagento({
-                    onlyInstallMagento: true
-                })
+                setupMagento({ onlyInstallMagento: true })
             )
         },
         dumpThemeConfig(),

package/lib/tasks/magento/index.js

@@ -1,5 +1,5 @@
 module.exports = {
-    installMagento: require('./install-magento'),
+    installMagentoProject: require('./install-magento-project'),
     setupMagento: require('./setup-magento'),
     uninstallMagento: require('./uninstall-magento'),
     removeMagento: require('./remove-magento')

package/lib/tasks/magento/{install-magento.js → install-magento-project.js}

@@ -8,6 +8,7 @@ const getJsonFileData = require('../../util/get-jsonfile-data');
 const rmdirSafe = require('../../util/rmdir-safe');
 const KnownError = require('../../errors/known-error');
 const UnknownError = require('../../errors/unknown-error');
+const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 
 const magentoProductEnterpriseEdition = 'magento/product-enterprise-edition';
 const magentoProductCommunityEdition = 'magento/product-community-edition';
@@ -124,9 +125,9 @@ const createMagentoProject = async ({
 };
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
-const installMagento = () => ({
+const installMagentoProject = () => ({
     title: 'Installing Magento',
     task: async (ctx, task) => {
         const { magentoVersion, config: { baseConfig, overridenConfiguration }, verbose } = ctx;
@@ -190,7 +191,7 @@ const installMagento = () => ({
         } catch (e) {
             if (e.message.includes('man-in-the-middle attack')) {
                 throw new KnownError(`Probably you haven't setup pubkeys in composer.
-Please run composer diagnose in cli to get mode.\n\n${e}`);
+Please run ${logger.style.command('composer diagnose')} in cli to get mode.\n\n${e}`);
             }
 
             throw new UnknownError(`Unexpected error during composer install.\n\n${e}`);
@@ -202,4 +203,4 @@ Please run composer diagnose in cli to get mode.\n\n${e}`);
     }
 });
 
-module.exports = installMagento;
+module.exports = installMagentoProject;

package/lib/tasks/magento/setup-magento/adjust-full-page-cache.js

@@ -2,7 +2,7 @@ const envPhpToJson = require('../../../util/env-php-json');
 const magentoTask = require('../../../util/magento-task');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const disableFullPageCache = () => ({
     title: 'Adjusting full_page cache setting',

package/lib/tasks/magento/setup-magento/configure-elasticsearch.js

@@ -1,7 +1,7 @@
 const { updateTableValues, isTableExists } = require('../../../util/database');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 module.exports = () => ({
     title: 'Configuring Elasticsearch',

package/lib/tasks/magento/setup-magento/create-admin.js

@@ -1,7 +1,7 @@
 const runMagentoCommand = require('../../../util/run-magento');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 module.exports = () => ({
     title: 'Creating admin user',

package/lib/tasks/magento/setup-magento/disable-2fa.js

@@ -2,7 +2,7 @@ const configPhpToJson = require('../../../util/config-php-json');
 const runMagentoCommand = require('../../../util/run-magento');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 module.exports = () => ({
     title: 'Disabling 2fa for admin',

package/lib/tasks/magento/setup-magento/disable-maintenance-mode.js

@@ -1,7 +1,7 @@
 const runMagentoCommand = require('../../../util/run-magento');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const disableMaintenanceMode = () => ({
     title: 'Disabling maintenance mode',

package/lib/tasks/magento/setup-magento/disable-page-builder.js

@@ -1,7 +1,7 @@
 const magentoTask = require('../../../util/magento-task');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const disablePageBuilder = () => ({
     title: 'Disabling page builder in Magento',

package/lib/tasks/magento/setup-magento/flush-redis-config.js

@@ -5,7 +5,7 @@ const UnknownError = require('../../../errors/unknown-error');
 const isLinux = os.platform() === 'linux';
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 module.exports = () => ({
     title: 'Flushing Magento redis cache',

package/lib/tasks/magento/setup-magento/increase-admin-session-lifetime.js

@@ -1,7 +1,7 @@
 const { updateTableValues } = require('../../../util/database');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const increaseAdminSessionLifetime = () => ({
     title: 'Increase admin session lifetime to 1 month',

package/lib/tasks/magento/setup-magento/index-products.js

@@ -1,7 +1,7 @@
 const magentoTask = require('../../../util/magento-task');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const indexProducts = () => ({
     task: (ctx, task) => task.newListr(

package/lib/tasks/magento/setup-magento/index.js

@@ -14,7 +14,9 @@ const urnHighlighter = require('./urn-highlighter');
 const waitingForVarnish = require('./waiting-for-varnish');
 
 /**
- * @type {({ onlyInstallMagento: boolean }) => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @param {Object} [options]
+ * @param {Boolean} options.onlyInstallMagento
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const setupMagento = (options = {}) => ({
     title: 'Setting up Magento',

package/lib/tasks/magento/setup-magento/install-magento.js

@@ -7,7 +7,9 @@ const envPhpToJson = require('../../../util/env-php-json');
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 
 /**
- * @type {({ isDbEmpty }: { isDbEmpty: boolean }) => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @param {Object} [param0]
+ * @param {Boolean} param0.isDbEmpty
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const installMagento = ({ isDbEmpty = false } = {}) => ({
     title: 'Installing magento',
@@ -82,7 +84,7 @@ const installMagento = ({ isDbEmpty = false } = {}) => ({
                 --db-user='${ env.MYSQL_USER }' \
                 --db-password='${ env.MYSQL_PASSWORD }' \
                 --backend-frontname='${ magentoConfiguration.adminuri }' \
-                --no-interaction ${ tries > 0 ? '--cleanup-database' : '' }`;
+                --no-interaction`;
 
                 await runMagentoCommand(command, {
                     magentoVersion,

package/lib/tasks/magento/setup-magento/migrate-database.js

@@ -1,12 +1,17 @@
+const path = require('path');
+const installMagentoProject = require('../install-magento-project');
 const magentoTask = require('../../../util/magento-task');
 const runMagentoCommand = require('../../../util/run-magento');
 const configureElasticsearch = require('./configure-elasticsearch');
 const installMagento = require('./install-magento');
 const upgradeMagento = require('./upgrade-magento');
 const varnishConfigSetup = require('./varnish-config');
+const pathExists = require('../../../util/path-exists');
 
 /**
- * @type {({ onlyInstallMagento: boolean }) => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @param {Object} [options]
+ * @param {Boolean} options.onlyInstallMagento
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const migrateDatabase = (options = {}) => ({
     title: 'Migrating database',
@@ -22,7 +27,11 @@ const migrateDatabase = (options = {}) => ({
             WHERE TABLE_SCHEMA = 'magento';
         `);
 
-        if (tableCount === 0) {
+        if (
+            tableCount === 0
+            || !(await pathExists(path.join(process.cwd(), 'app', 'etc', 'env.php'))
+            || (!await pathExists(path.join(process.cwd(), 'app', 'etc', 'config.php'))))
+        ) {
             if (options.onlyInstallMagento) {
                 ctx.isSetupUpgradeNeeded = false;
                 return task.newListr(
@@ -32,10 +41,10 @@ const migrateDatabase = (options = {}) => ({
 
             return task.newListr([
                 installMagento({ isDbEmpty: true }),
-                upgradeMagento(),
-                magentoTask('cache:enable'),
                 varnishConfigSetup(),
-                configureElasticsearch()
+                configureElasticsearch(),
+                upgradeMagento(),
+                magentoTask('cache:enable')
             ], {
                 concurrent: false,
                 exitOnError: true,
@@ -45,6 +54,7 @@ const migrateDatabase = (options = {}) => ({
                 }
             });
         }
+
         const { code } = await runMagentoCommand('setup:db:status', {
             magentoVersion,
             throwNonZeroCode: false
@@ -70,16 +80,16 @@ const migrateDatabase = (options = {}) => ({
             if (options.onlyInstallMagento) {
                 ctx.isSetupUpgradeNeeded = false;
                 return task.newListr(
-                    installMagento()
+                    installMagentoProject()
                 );
             }
 
             return task.newListr([
-                installMagento(),
-                upgradeMagento(),
-                magentoTask('cache:enable'),
+                installMagentoProject(),
                 varnishConfigSetup(),
-                configureElasticsearch()
+                configureElasticsearch(),
+                upgradeMagento(),
+                magentoTask('cache:enable')
             ], {
                 concurrent: false,
                 exitOnError: true,

package/lib/tasks/magento/setup-magento/set-base-url.js

@@ -1,7 +1,7 @@
 const { updateTableValues } = require('../../../util/database');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 module.exports = () => ({
     title: 'Setting baseurl and secure baseurl',

package/lib/tasks/magento/setup-magento/set-deployment-mode.js

@@ -2,7 +2,7 @@ const magentoTask = require('../../../util/magento-task');
 const runMagentoCommand = require('../../../util/run-magento');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 module.exports = () => ({
     title: 'Switching Magento mode',

package/lib/tasks/magento/setup-magento/set-url-rewrite.js

@@ -1,9 +1,7 @@
-// const runMagentoCommand = require('../../../util/run-magento');
-
 const { updateTableValues } = require('../../../util/database');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const setUrlRewrite = () => ({
     title: 'Setting up url-rewrites',

package/lib/tasks/magento/setup-magento/upgrade-magento.js

@@ -3,7 +3,7 @@ const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const KnownError = require('../../../errors/known-error');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const upgradeMagento = () => ({
     skip: (ctx) => {

package/lib/tasks/magento/setup-magento/urn-highlighter.js

@@ -4,18 +4,18 @@ const magentoTask = require('../../../util/magento-task');
 const pathExists = require('../../../util/path-exists');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  *
  * @reference https://devdocs.magento.com/guides/v2.4/config-guide/cli/config-cli-subcommands-urn.html
  */
 const urnHighlighter = () => ({
     title: 'Generating URN highlighter',
     task: async (ctx, task) => {
-        if (!await pathExists(path.resolve('./.idea'))) {
-            await fs.promises.mkdir(path.resolve('./.idea'));
+        if (!await pathExists(path.join(process.cwd(), './.idea'))) {
+            await fs.promises.mkdir(path.join(process.cwd(), './.idea'));
         }
 
-        if (await pathExists(path.resolve('./.idea/misc.xml'))) {
+        if (await pathExists(path.join(process.cwd(), './.idea/misc.xml'))) {
             task.skip();
             return;
         }

package/lib/tasks/magento/setup-magento/varnish-config.js

@@ -3,7 +3,7 @@ const { updateTableValues } = require('../../../util/database');
 const getIsWsl = require('../../../util/is-wsl');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const varnishConfigSetup = () => ({
     title: 'Varnish setup',
@@ -24,7 +24,6 @@ const varnishConfigSetup = () => ({
 
         const isLinux = os.platform() === 'linux';
         const isWsl = await getIsWsl();
-        // const host = (isLinux && !isWsl) ? 'localhost' : 'host.docker.internal';
 
         if (varnishEnabled) {
             await updateTableValues('core_config_data', [

package/lib/tasks/magento/setup-magento/waiting-for-redis.js

@@ -1,7 +1,7 @@
 const waitForIt = require('../../../util/wait-for-it');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 module.exports = () => ({
     title: 'Waiting for Redis',

package/lib/tasks/magento/setup-magento/waiting-for-varnish.js

@@ -3,7 +3,7 @@ const KnownError = require('../../../errors/known-error');
 const sleep = require('../../../util/sleep');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const waitingForVarnish = () => ({
     title: 'Waiting for Varnish to return code 200',

package/lib/tasks/php/bundled-extensions.js

@@ -16,7 +16,6 @@ const bundledExtensions = [
     'mysql',
     'pdo',
     'soap',
-    'xmlrpc',
     'xml',
     'zip',
     'fpm',

package/lib/tasks/php/update-env-php.js

@@ -9,7 +9,7 @@ const updateEnvPHP = () => ({
     title: 'Updating env.php',
     task: async (ctx, task) => {
         // update env.php only if it's exist
-        if (!await pathExists(path.resolve('app', 'etc', 'env.php'))) {
+        if (!await pathExists(path.join(process.cwd(), 'app', 'etc', 'env.php'))) {
             task.skip();
             return;
         }

package/lib/tasks/requirements/dependency/mac.js

@@ -1,43 +1,120 @@
-const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const dependenciesForPlatforms = require('../../../config/dependencies-for-platforms');
-const KnownError = require('../../../errors/known-error');
-const { execAsyncSpawn } = require('../../../util/exec-async-command');
+const { execAsyncSpawn, execCommandTask } = require('../../../util/exec-async-command');
 const {
     BREW_BIN_PATH_ARM_NATIVE,
     BREW_BIN_PATH_ARM_ROSETTA,
+    BREW_BIN_PATH_INTEL,
     getBrewCommand
 } = require('../../../util/get-brew-bin-path');
 const installDependenciesTask = require('../../../util/install-dependencies-task');
 const pathExists = require('../../../util/path-exists');
+
+const brewInstallCommand = '$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)';
+
+/**
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ */
+const installBrewRosettaTask = () => ({
+    title: 'Installing Brew using Rosetta 2',
+    task: async (ctx, task) => {
+        if (await pathExists(BREW_BIN_PATH_ARM_ROSETTA)) {
+            task.skip('Brew in Rosetta is already installed');
+            return;
+        }
+
+        return task.newListr(
+            execCommandTask(brewInstallCommand, {
+                useRosetta2: true
+            })
+        );
+    }
+});
+
+/**
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ */
+const installBrewNativeTask = () => ({
+    title: 'Installing Brew',
+    task: async (ctx, task) => {
+        if (
+            (ctx.arch === 'arm64' && await pathExists(BREW_BIN_PATH_ARM_NATIVE))
+            || (ctx.arch === 'x64' && await pathExists(BREW_BIN_PATH_INTEL))
+        ) {
+            task.skip('Brew in native path is already installed');
+            return;
+        }
+
+        return task.newListr(
+            execCommandTask(brewInstallCommand, {
+                useRosetta2: false
+            })
+        );
+    }
+});
+
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const macDependenciesCheck = () => ({
     title: 'Checking MacOS dependencies',
     task: async (ctx, task) => {
+        const tasks = [installBrewNativeTask()];
+
         if (ctx.arch === 'arm64') {
-            if (!await pathExists(BREW_BIN_PATH_ARM_ROSETTA) && await pathExists(BREW_BIN_PATH_ARM_NATIVE)) {
-                throw new KnownError(`Missing rosetta brew!
-Please make sure that you have installed brew in rosetta2 terminal!
-Follow the instructions: ${logger.style.link('https://docs.create-magento-app.com/getting-started/prerequisites/installation-on-macos/installation-on-macos-apple-silicon')}`);
-            }
-        }
-        const installedDependencies = (await execAsyncSpawn(`${await getBrewCommand()} list`)).split('\n');
-
-        const dependenciesToInstall = dependenciesForPlatforms
-            .darwin
-            .dependencies
-            .filter((dep) => !installedDependencies.includes(dep));
-
-        if (dependenciesToInstall.length > 0) {
-            return task.newListr(
-                installDependenciesTask({
-                    platform: 'darwin',
-                    dependenciesToInstall,
-                    useMacNativeEnvironment: false
-                })
-            );
+            tasks.push(installBrewRosettaTask());
         }
+
+        return task.newListr(
+            tasks.concat([
+                {
+                    task: async () => {
+                        const installDependenciesTasks = [];
+                        if (ctx.arch === 'arm64') {
+                            const installedNativeDependencies = (
+                                await execAsyncSpawn(`${await getBrewCommand({ native: true })} list`, { useRosetta2: false })
+                            ).split('\n');
+                            const dependenciesToInstallOnArm = dependenciesForPlatforms['darwin-arm']
+                                .dependencies
+                                .filter((dep) => !installedNativeDependencies.includes(dep));
+
+                            if (dependenciesToInstallOnArm.length > 0) {
+                                installDependenciesTasks.push(
+                                    installDependenciesTask({
+                                        platform: 'darwin-arm',
+                                        dependenciesToInstall: dependenciesToInstallOnArm,
+                                        useMacNativeEnvironment: true
+                                    })
+                                );
+                            }
+                        }
+
+                        const installedDependencies = (
+                            await execAsyncSpawn(`${await getBrewCommand({ native: false })} list`, { useRosetta2: true })
+                        ).split('\n');
+                        const dependenciesToInstall = dependenciesForPlatforms
+                            .darwin
+                            .dependencies
+                            .filter((dep) => !installedDependencies.includes(dep));
+
+                        if (dependenciesToInstall.length > 0) {
+                            installDependenciesTasks.push(
+                                installDependenciesTask({
+                                    platform: 'darwin',
+                                    dependenciesToInstall,
+                                    useMacNativeEnvironment: false
+                                })
+                            );
+                        }
+
+                        if (installDependenciesTasks.length > 0) {
+                            return task.newListr(installDependenciesTasks);
+                        }
+
+                        task.skip();
+                    }
+                }
+            ])
+        );
     },
     options: {
         bottomBar: 10

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

@@ -3,78 +3,10 @@ const path = require('path');
 const fs = require('fs');
 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>}
- */
-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', 'gd'].filter((dep) => !installedDependencies.includes(dep));
-
-            if (dependenciesToInstall.length === 0) {
-                task.skip();
-                return;
-            }
-
-            return task.newListr(
-                installDependenciesTask({
-                    platform: 'darwin',
-                    dependenciesToInstall,
-                    useMacNativeEnvironment: true
-                })
-            );
-        }
-        const distro = await osPlatform();
-        switch (distro) {
-        case 'Arch Linux': {
-            return task.newListr(
-                installDependenciesTask({
-                    platform: 'Arch Linux',
-                    dependenciesToInstall: ['php', 'pkg-config']
-                })
-            );
-        }
-        case 'Fedora': {
-            return task.newListr(
-                installDependenciesTask({
-                    platform: 'Fedora',
-                    dependenciesToInstall: ['php']
-                })
-            );
-        }
-        case 'CentOS': {
-            return task.newListr(
-                installDependenciesTask({
-                    platform: 'CentOS',
-                    dependenciesToInstall: ['php']
-                })
-            );
-        }
-        case 'Ubuntu': {
-            return task.newListr(
-                installDependenciesTask({
-                    platform: 'Ubuntu',
-                    dependenciesToInstall: ['php']
-                })
-            );
-        }
-        default: {
-            task.skip();
-        }
-        }
-    }
-});
-
-/**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const installXcode = () => ({
     title: 'Installing XCode',
@@ -105,7 +37,7 @@ const installXcode = () => ({
 });
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const installPHPBrewBinary = () => ({
     title: 'Installing PHPBrew binary',
@@ -138,7 +70,7 @@ const installPHPBrewBinary = () => ({
 });
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const addPHPBrewInitiatorLineToConfigFile = () => ({
     task: async (ctx, task) => {
@@ -188,7 +120,7 @@ Then you can continue installation.`);
 });
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const installPHPBrew = () => ({
     title: 'Installing PHPBrew',
@@ -196,14 +128,12 @@ const installPHPBrew = () => ({
         if (process.platform === 'darwin') {
             return task.newListr([
                 installXcode(),
-                installPHPBrewDependencies(),
                 installPHPBrewBinary(),
                 addPHPBrewInitiatorLineToConfigFile()
             ]);
         }
 
         return task.newListr([
-            installPHPBrewDependencies(),
             installPHPBrewBinary(),
             addPHPBrewInitiatorLineToConfigFile()
         ]);

package/lib/tasks/start.js

@@ -10,7 +10,7 @@ const { checkRequirements } = require('./requirements');
 const { createCacheFolder } = require('./cache');
 const { startPhpFpm, stopPhpFpm } = require('./php-fpm');
 const { prepareFileSystem } = require('./file-system');
-const { installMagento, setupMagento } = require('./magento');
+const { installMagentoProject, setupMagento } = require('./magento');
 const { pullContainers, stopContainers } = require('./docker/containers');
 const { setPrefix } = require('./prefix');
 const {
@@ -118,7 +118,7 @@ const configureProject = () => ({
         configurePhp(),
         validatePHPInstallation(),
         installPrestissimo(),
-        installMagento(),
+        installMagentoProject(),
         enableMagentoComposerPlugins(),
         startServices(),
         startPhpFpm(),

package/lib/util/install-dependencies-task.js

@@ -14,16 +14,14 @@ const KnownError = require('../errors/known-error');
  * @returns {import('listr2').ListrTask<import('../../typings/context').ListrContext>}
  */
 const installDependenciesTask = (options) => ({
-    title: 'Installing missing dependencies',
     task: async (ctx, task) => {
         const { dependenciesToInstall, platform } = options;
+        task.title = `Installing ${platform} dependencies`;
         let cmd;
         if (os.platform() === 'darwin') {
-            if (options.useMacNativeEnvironment) {
-                cmd = dependenciesForPlatforms[platform].installCommand(dependenciesToInstall.join(' '), { native: true });
-            } else {
-                cmd = dependenciesForPlatforms[platform].installCommand(dependenciesToInstall.join(' '));
-            }
+            cmd = dependenciesForPlatforms[platform].installCommand(dependenciesToInstall.join(' '), {
+                native: options.useMacNativeEnvironment
+            });
         } else {
             cmd = dependenciesForPlatforms[platform].installCommand(dependenciesToInstall.join(' '));
         }

package/package.json

@@ -3,7 +3,7 @@
     "description": "Scripts and configuration used by CMA.",
     "homepage": "https://docs.create-magento-app.com/",
     "repository": "github:scandipwa/create-magento-app",
-    "version": "1.15.6",
+    "version": "1.15.7",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -53,5 +53,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "78f8b8d57032441f7667da0ef98ef6370de2fc7c"
+    "gitHead": "f9e7474aca6c1a80ec37f6d51ab2a1a8a61582cc"
 }