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

package/lib/util/get-brew-bin-path.js

@@ -0,0 +1,64 @@
+const { getArch, getArchSync } = require('./arch');
+
+const BREW_BIN_PATH_INTEL = '/usr/local/bin/brew';
+const BREW_BIN_PATH_ARM_ROSETTA = '/usr/local/homebrew/bin/brew';
+// native is not used ATM
+const BREW_BIN_PATH_ARM_NATIVE = '/opt/homebrew/bin/brew';
+
+const getBrewBinPath = async () => {
+    const arch = await getArch();
+
+    if (arch === 'arm64') {
+        return BREW_BIN_PATH_ARM_ROSETTA;
+    }
+
+    return BREW_BIN_PATH_INTEL;
+};
+
+const getBrewBinPathSync = () => {
+    const arch = getArchSync();
+
+    if (arch === 'arm64') {
+        return BREW_BIN_PATH_ARM_ROSETTA;
+    }
+
+    return BREW_BIN_PATH_INTEL;
+};
+
+const getBrewCommand = async ({ native } = { native: false }) => {
+    const arch = await getArch();
+
+    if (arch === 'arm64') {
+        if (native) {
+            return `arch -arm64 ${BREW_BIN_PATH_ARM_NATIVE}`;
+        }
+
+        return `arch -x86_64 ${BREW_BIN_PATH_ARM_ROSETTA}`;
+    }
+
+    return BREW_BIN_PATH_INTEL;
+};
+
+const getBrewCommandSync = ({ native } = { native: false }) => {
+    const arch = getArchSync();
+
+    if (arch === 'arm64') {
+        if (native) {
+            return `arch -arm64 ${BREW_BIN_PATH_ARM_NATIVE}`;
+        }
+
+        return `arch -x86_64 ${BREW_BIN_PATH_ARM_ROSETTA}`;
+    }
+
+    return BREW_BIN_PATH_INTEL;
+};
+
+module.exports = {
+    getBrewBinPath,
+    getBrewBinPathSync,
+    getBrewCommand,
+    getBrewCommandSync,
+    BREW_BIN_PATH_INTEL,
+    BREW_BIN_PATH_ARM_ROSETTA,
+    BREW_BIN_PATH_ARM_NATIVE
+};

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

@@ -10,13 +10,23 @@ const KnownError = require('../errors/known-error');
  * @param {object} options
  * @param {keyof dependenciesForPlatforms} options.platform Platform
  * @param {string[]} options.dependenciesToInstall List of dependencies to install
+ * @param {boolean} options.useMacNativeEnvironment Use Mac native environment
  * @returns {import('listr2').ListrTask<import('../../typings/context').ListrContext>}
  */
 const installDependenciesTask = (options) => ({
     title: 'Installing missing dependencies',
     task: async (ctx, task) => {
         const { dependenciesToInstall, platform } = options;
-        const cmd = dependenciesForPlatforms[platform].installCommand(dependenciesToInstall.join(' '));
+        let cmd;
+        if (os.platform() === 'darwin') {
+            if (options.useMacNativeEnvironment) {
+                cmd = dependenciesForPlatforms[platform].installCommand(dependenciesToInstall.join(' '), { native: true });
+            } else {
+                cmd = dependenciesForPlatforms[platform].installCommand(dependenciesToInstall.join(' '));
+            }
+        } else {
+            cmd = dependenciesForPlatforms[platform].installCommand(dependenciesToInstall.join(' '));
+        }
         const installCommand = logger.style.code(cmd);
         const dependenciesWordFormatter = `dependenc${dependenciesToInstall.length > 1 ? 'ies' : 'y'}`;
         task.title = `Installing missing dependencies: ${ logger.style.code(dependenciesToInstall.join(', ')) }`;

package/lib/util/php-task.js

@@ -1,20 +1,20 @@
 const runPhpCode = require('./run-php');
 
 /**
- * @type {(
- * command: string,
- * options: { noTitle: boolean, env: Record<string, string> }
- * ) => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
+ * @param {String} command
+ * @param {{ noTitle: boolean, env: Record<string, string> }} options
+ * @returns {import('listr2').ListrTask<import('../../typings/context').ListrContext>}
  */
 const phpTask = (command, options = {}) => ({
     title: !options.noTitle ? `Running command 'php ${command}` : undefined,
-    task: ({ magentoVersion }, task) => runPhpCode(command, {
+    task: (ctx, task) => runPhpCode(command, {
         callback: (t) => {
             task.output = t;
         },
         throwNonZeroCode: true,
-        magentoVersion,
-        env: options.env
+        magentoVersion: ctx.magentoVersion,
+        env: options.env,
+        useRosettaOnMac: ctx.arch === 'arm64' && ctx.platform === 'darwin'
     })
 });
 

package/lib/util/run-composer.js

@@ -21,7 +21,8 @@ const runComposerCommand = async (command, options = {}) => {
     const { code, result } = await execAsyncSpawn(`${php.binPath} -c ${php.iniPath} ${composer.binPath} ${command}`, {
         ...options,
         cwd: magentoDir,
-        withCode: true
+        withCode: true,
+        useRosetta2: true
     });
 
     if (throwNonZeroCode && code !== 0) {

package/lib/util/run-php.js

@@ -12,6 +12,7 @@ const UnknownError = require('../errors/unknown-error');
  * @param {Boolean} options.throwNonZeroCode Throw if command return non 0 code.
  * @param {String} options.magentoVersion Magento version for config
  * @param {Record<string, string>} options.env Environment variables
+ * @param {Boolean} options.useRosettaOnMac Use Rosetta 2 on MacOS
  */
 const runPhpCode = async (command, options = {}) => {
     const {
@@ -24,6 +25,9 @@ const runPhpCode = async (command, options = {}) => {
         const env = Object.entries(options.env).map(([key, value]) => `${key}=${value}`).join(' ');
         spawnCommand = `${env} ${spawnCommand}`;
     }
+    if (options.useRosettaOnMac) {
+        spawnCommand = `arch -x86_64 bash -c '${spawnCommand}'`;
+    }
     const { code, result } = await execAsyncSpawn(spawnCommand, {
         ...options,
         withCode: true

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.14.1-alpha.11",
+    "version": "1.14.1-alpha.12",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -26,6 +26,7 @@
         "conf": "10.1.1",
         "enquirer": "2.3.6",
         "eta": "1.12.3",
+        "fast-xml-parser": "^4.0.7",
         "hjson": "^3.2.2",
         "is-installed-globally": "0.4.0",
         "joi": "17.6.0",
@@ -52,5 +53,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "3e86a5870f29d0b24ac3f65ff5fdbe96ef5bd025"
+    "gitHead": "c765f4fe97f9d09cabfd928fc127484eb2cac911"
 }

package/typings/context.d.ts

@@ -1,6 +1,7 @@
 import mysql2 from 'mysql2';
 
 import { CMAConfiguration, PHPExtensions } from './index';
+import { PHPStormConfig } from './phpstorm';
 
 export interface ListrContext {
     magentoVersion: string
@@ -18,6 +19,7 @@ export interface ListrContext {
     arch: 'arm64' | 'x64'
     isArm: boolean
     isWsl: boolean
+    isArmMac: boolean
     platform?: NodeJS.Platform
     platformVersion?: string
     /**
@@ -85,6 +87,7 @@ export interface ListrContext {
         overridenConfiguration: Omit<CMAConfiguration, 'prefix' | 'useNonOverlappingPorts'>
         userConfiguration: Omit<CMAConfiguration, 'prefix' | 'useNonOverlappingPorts'>
         nonOverridenConfiguration: Omit<CMAConfiguration, 'prefix' | 'useNonOverlappingPorts'>
+        phpStorm: PHPStormConfig
     }
     systemConfiguration: {
         analytics: boolean

package/typings/phpstorm.d.ts

@@ -0,0 +1,33 @@
+export interface PHPStormConfig {
+    xdebug: {
+        v2Port: string;
+        v3Port: string;
+        debugServerAddress: string;
+        serverName: string;
+        runManagerName: string;
+        sessionId: string;
+        path: string;
+        templatePath: string;
+    }
+    php: {
+        phpLanguageLevel: string;
+        path: string;
+        templatePath: string;
+    }
+    database: {
+        driver: string;
+        dataSourceManagerName: string;
+        dataSourcesLocal: {
+            path: string;
+            templatePath: string;
+        }
+        dataSources: {
+            path: string;
+            templatePath: string;
+        }
+    }
+    inspectionTools: {
+        path: string;
+        templatePath: string;
+    }
+}

package/lib/tasks/file-system/create-php-storm-config.js

@@ -1,83 +0,0 @@
-const setConfigFile = require('../../util/set-config');
-const pathExists = require('../../util/path-exists');
-const path = require('path');
-const fs = require('fs');
-const UnknownError = require('../../errors/unknown-error');
-
-const createPhpStormConfig = () => ({
-    title: 'Setting PHPStorm config',
-    task: async ({ config: { phpStorm }, ports }) => {
-        const { phpLanguageLevel } = phpStorm.php;
-        const jdbcUrl = `jdbc:mysql://localhost:${ports.mysql}/magento`;
-
-        try {
-            await setConfigFile({
-                configPathname: phpStorm.xdebug.path,
-                template: phpStorm.xdebug.templatePath,
-                overwrite: true,
-                templateArgs: {
-                    phpStorm
-                }
-            });
-        } catch (e) {
-            throw new UnknownError(`Unexpected error accrued during workspace.xml config creation\n\n${e}`);
-        }
-
-        try {
-            await setConfigFile({
-                configPathname: phpStorm.php.path,
-                template: phpStorm.php.templatePath,
-                overwrite: true,
-                templateArgs: {
-                    phpLanguageLevel
-                }
-            });
-        } catch (e) {
-            throw new UnknownError(`Unexpected error accrued during php.xml config creation\n\n${e}`);
-        }
-
-        try {
-            await setConfigFile({
-                configPathname: phpStorm.database.dataSourcesLocal.path,
-                template: phpStorm.database.dataSourcesLocal.templatePath,
-                overwrite: true,
-                templateArgs: {
-                    phpStorm
-                }
-            });
-        } catch (e) {
-            throw new UnknownError(`Unexpected error accrued during dataSources.local.xml config creation\n\n${e}`);
-        }
-
-        try {
-            await setConfigFile({
-                configPathname: phpStorm.database.dataSources.path,
-                template: phpStorm.database.dataSources.templatePath,
-                overwrite: true,
-                templateArgs: {
-                    phpStorm,
-                    jdbcUrl
-                }
-            });
-        } catch (e) {
-            throw new UnknownError(`Unexpected error accrued during dataSources.xml config creation\n\n${e}`);
-        }
-
-        if (!await pathExists(path.resolve('./.idea/dataSources'))) {
-            await fs.promises.mkdir(path.resolve('./.idea/dataSources'));
-        }
-
-        try {
-            await setConfigFile({
-                configPathname: phpStorm.inspectionTools.path,
-                template: phpStorm.inspectionTools.templatePath,
-                overwrite: true,
-                templateArgs: {}
-            });
-        } catch (e) {
-            throw new UnknownError(`Unexpected error accrued during Project_Default.xml config creation\n\n${e}`);
-        }
-    }
-});
-
-module.exports = createPhpStormConfig;

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

@@ -1,20 +0,0 @@
-const envPhpToJson = require('../../../util/env-php-json');
-const magentoTask = require('../../../util/magento-task');
-
-/**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
- */
-const disableFullPageCache = () => ({
-    title: 'Disabling full_page cache in Magento',
-    task: async ({ magentoVersion }, task) => {
-        const { cache_types } = await envPhpToJson(process.cwd(), { magentoVersion });
-
-        if (cache_types.full_page !== 0) {
-            return task.newListr(magentoTask('cache:disable full_page'));
-        }
-
-        task.skip();
-    }
-});
-
-module.exports = disableFullPageCache;