@scandipwa/magento-scripts 1.16.0-alpha.3 → 1.16.0-alpha.4

package/lib/config/php/extensions/libsodium.js

@@ -1,8 +1,8 @@
 const path = require('path');
 const fs = require('fs');
-const os = require('os');
 const pathExists = require('../../../util/path-exists');
 const UnknownError = require('../../../errors/unknown-error');
+const phpbrewConfig = require('../../phpbrew');
 
 /**
  * @type {import('../../../../typings/index').PHPExtension}
@@ -12,9 +12,7 @@ module.exports = {
     hooks: {
         postInstall: async ({ php }) => {
             const sodiumDynamicLibraryPath = path.join(
-                os.homedir(),
-                '.phpbrew',
-                'php',
+                phpbrewConfig.phpPath,
                 `php-${php.version}`,
                 'var',
                 'db',

package/lib/config/php-config.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const os = require('os');
+const phpbrewConfig = require('./phpbrew');
 
 module.exports = (app, config) => {
     const { php } = app;
@@ -7,9 +7,7 @@ module.exports = (app, config) => {
     const { cacheDir } = config;
 
     const phpVersionDir = path.join(
-        os.homedir(),
-        '.phpbrew',
-        'php',
+        phpbrewConfig.phpPath,
         `php-${ php.version }`
     );
 

package/lib/tasks/docker/containers.js

@@ -1,6 +1,8 @@
 /* eslint-disable max-len */
 const { execAsyncSpawn } = require('../../util/exec-async-command');
+const sleep = require('../../util/sleep');
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
+const KnownError = require('../../errors/known-error');
 
 /**
  * @param {Object} options
@@ -164,6 +166,41 @@ const getContainerStatus = async (containerName) => {
     }
 };
 
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const checkContainersAreRunning = () => ({
+    title: 'Checking container statuses',
+    task: async (ctx, task) => {
+        const { config: { docker }, ports } = ctx;
+        const containers = Object.values(docker.getContainers(ports));
+        let tries = 0;
+        while (tries < 3) {
+            const containersWithStatus = await Promise.all(
+                containers.map(async (container) => ({
+                    ...container,
+                    status: await getContainerStatus(container.name)
+                }))
+            );
+
+            if (containersWithStatus.some((c) => c.status.Status !== 'running')) {
+                if (tries === 2) {
+                    throw new KnownError(`${containersWithStatus.filter((c) => c.status.Status !== 'running').map((c) => c._).join(', ')} containers are not running! Please check container logs for more details!`);
+                } else {
+                    task.output = `${containersWithStatus.filter((c) => c.status.Status !== 'running').map((c) => c._).join(', ')} are not running, waiting if something will change...`;
+                    await sleep(2000);
+                    tries++;
+                }
+            } else {
+                break;
+            }
+        }
+    },
+    options: {
+        bottomBar: 10
+    }
+});
+
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
@@ -188,5 +225,7 @@ module.exports = {
     startContainers,
     stopContainers,
     pullContainers,
-    statusContainers
+    statusContainers,
+    checkContainersAreRunning,
+    getContainerStatus
 };

package/lib/tasks/docker/index.js

@@ -19,7 +19,8 @@ const startServices = () => ({
                 ctx
             })
         },
-        containers.startContainers()
+        containers.startContainers(),
+        containers.checkContainersAreRunning()
     ], {
         concurrent: false,
         exitOnError: true

package/lib/tasks/php/compile.js

@@ -3,6 +3,7 @@ const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const { execAsyncSpawn } = require('../../util/exec-async-command');
 const compileOptions = require('./compile-options');
 const UnknownError = require('../../errors/unknown-error');
+const { getPHPForPHPBrewBin } = require('../../util/get-php-for-phpbrew');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -10,6 +11,7 @@ const UnknownError = require('../../errors/unknown-error');
 const compilePHP = () => ({
     title: 'Compiling PHP',
     task: async ({ config: { php } }, task) => {
+        const phpBinForPHPBrew = await getPHPForPHPBrewBin();
         const platformCompileOptions = compileOptions[process.platform];
         if (process.platform === 'linux') {
             const { distro } = await systeminformation.osInfo();
@@ -29,7 +31,11 @@ const compilePHP = () => ({
                     callback: (t) => {
                         task.output = t;
                     },
-                    useRosetta2: true
+                    useRosetta2: true,
+                    env: phpBinForPHPBrew ? {
+                        ...process.env,
+                        PATH: `${phpBinForPHPBrew}:${process.env.PATH}`
+                    } : process.env
                 }
             );
         } catch (e) {

package/lib/tasks/php/extensions/disable.js

@@ -1,6 +1,7 @@
 /* eslint-disable max-len */
 const phpbrewConfig = require('../../../config/phpbrew');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
+const { getPHPForPHPBrewBin } = require('../../../util/get-php-for-phpbrew');
 
 /**
  * @param {String} extensionName
@@ -9,6 +10,7 @@ const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const disableExtension = (extensionName) => ({
     title: `Disabling ${extensionName} extension`,
     task: async (ctx, task) => {
+        const phpBinForPHPBrew = await getPHPForPHPBrewBin();
         const {
             config,
             config: { php }
@@ -28,7 +30,11 @@ const disableExtension = (extensionName) => ({
                 callback: (t) => {
                     task.output = t;
                 },
-                useRosetta2: true
+                useRosetta2: true,
+                env: phpBinForPHPBrew ? {
+                    ...process.env,
+                    PATH: `${phpBinForPHPBrew}:${process.env.PATH}`
+                } : process.env
             });
             if (hooks && hooks.postDisable) {
                 await Promise.resolve(hooks.postDisable(config));

package/lib/tasks/php/extensions/enable.js

@@ -1,6 +1,7 @@
 /* eslint-disable max-len */
 const phpbrewConfig = require('../../../config/phpbrew');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
+const { getPHPForPHPBrewBin } = require('../../../util/get-php-for-phpbrew');
 
 /**
  * @param {String} extensionName
@@ -10,6 +11,7 @@ const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const enableExtension = (extensionName, extensionOptions) => ({
     title: `Enabling ${extensionName} extension`,
     task: async (ctx, task) => {
+        const phpBinForPHPBrew = await getPHPForPHPBrewBin();
         const {
             config,
             config: { php }
@@ -30,7 +32,11 @@ const enableExtension = (extensionName, extensionOptions) => ({
                 callback: (t) => {
                     task.output = t;
                 },
-                useRosetta2: true
+                useRosetta2: true,
+                env: phpBinForPHPBrew ? {
+                    ...process.env,
+                    PATH: `${phpBinForPHPBrew}:${process.env.PATH}`
+                } : process.env
             });
 
             if (hooks && hooks.postEnable) {

package/lib/tasks/php/extensions/index.js

@@ -4,6 +4,7 @@ const fs = require('fs');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const pathExists = require('../../../util/path-exists');
 const phpbrewConfig = require('../../../config/phpbrew');
+const { getPHPForPHPBrewBin } = require('../../../util/get-php-for-phpbrew');
 
 /**
  * Get enabled extensions list with versions
@@ -11,9 +12,16 @@ const phpbrewConfig = require('../../../config/phpbrew');
  * @returns {Promise<{[key: string]: string}}>}
  */
 const getEnabledExtensions = async ({ php }) => {
+    const phpBinForPHPBrew = await getPHPForPHPBrewBin();
     const output = await execAsyncSpawn(
         `${ php.binPath } -c ${php.iniPath} -r 'foreach (get_loaded_extensions() as $extension) echo "$extension:" . phpversion($extension) . "\n";'`,
-        { useRosetta2: true }
+        {
+            useRosetta2: true,
+            env: phpBinForPHPBrew ? {
+                ...process.env,
+                PATH: `${phpBinForPHPBrew}:${process.env.PATH}`
+            } : process.env
+        }
     );
 
     return output

package/lib/tasks/php/extensions/install.js

@@ -1,6 +1,7 @@
 /* eslint-disable max-len */
 const phpbrewConfig = require('../../../config/phpbrew');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
+const { getPHPForPHPBrewBin } = require('../../../util/get-php-for-phpbrew');
 
 /**
  * @param {String} extensionName
@@ -10,6 +11,7 @@ const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const installExtension = (extensionName, extensionOptions) => ({
     title: `Installing ${extensionName} extension`,
     task: async (ctx, task) => {
+        const phpBinForPHPBrew = await getPHPForPHPBrewBin();
         const {
             config,
             config: { php }
@@ -32,7 +34,11 @@ const installExtension = (extensionName, extensionOptions) => ({
                 callback: (t) => {
                     task.output = t;
                 },
-                useRosetta2: true
+                useRosetta2: true,
+                env: phpBinForPHPBrew ? {
+                    ...process.env,
+                    PATH: `${phpBinForPHPBrew}:${process.env.PATH}`
+                } : process.env
             });
 
             if (hooks && hooks.postInstall) {

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

@@ -1,5 +1,6 @@
 const UnknownError = require('../../errors/unknown-error');
 const { execAsyncSpawn } = require('../../util/exec-async-command');
+const { getPHPForPHPBrewBin } = require('../../util/get-php-for-phpbrew');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -7,9 +8,14 @@ const { execAsyncSpawn } = require('../../util/exec-async-command');
 const updatePhpBrew = () => ({
     title: 'Updating PHPBrew PHP versions',
     task: async ({ config: { php } }, task) => {
+        const phpBinForPHPBrew = await getPHPForPHPBrewBin();
         try {
             const knownPhpVersions = await execAsyncSpawn('phpbrew known', {
-                useRosetta2: true
+                useRosetta2: true,
+                env: phpBinForPHPBrew ? {
+                    ...process.env,
+                    PATH: `${phpBinForPHPBrew}:${process.env.PATH}`
+                } : process.env
             });
 
             if (knownPhpVersions.includes(`${php.version}`)) {
@@ -21,7 +27,11 @@ const updatePhpBrew = () => ({
                 callback: (t) => {
                     task.output = t;
                 },
-                useRosetta2: true
+                useRosetta2: true,
+                env: phpBinForPHPBrew ? {
+                    ...process.env,
+                    PATH: `${phpBinForPHPBrew}:${process.env.PATH}`
+                } : process.env
             });
         } catch (e) {
             throw new UnknownError(`Unexpected error while updating phpbrew known php versions\n\n${e}`);

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

@@ -1,6 +1,7 @@
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const KnownError = require('../../../errors/known-error');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
+const { getPHPForPHPBrewBin } = require('../../../util/get-php-for-phpbrew');
 const installPHPBrew = require('./install');
 const getPHPBrewVersion = require('./version');
 
@@ -10,8 +11,13 @@ const getPHPBrewVersion = require('./version');
 const checkPHPBrew = () => ({
     title: 'Checking phpbrew',
     task: async (ctx, task) => {
+        const phpBinForPHPBrew = await getPHPForPHPBrewBin();
         const { code } = await execAsyncSpawn('phpbrew --version', {
-            withCode: true
+            withCode: true,
+            env: phpBinForPHPBrew ? {
+                ...process.env,
+                PATH: `${phpBinForPHPBrew}:${process.env.PATH}`
+            } : process.env
         });
 
         if (code !== 0) {

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

@@ -68,7 +68,6 @@ const installPHPBrewBinary = () => ({
         bottomBar: 10
     }
 });
-
 /**
  * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
@@ -79,12 +78,19 @@ const addPHPBrewInitiatorLineToConfigFile = () => ({
         const shellConfigFileName = `.${shellName}rc`;
 
         const addLineToShellConfigFIle = await task.prompt({
-            type: 'Confirm',
+            type: 'Select',
             message: `To finish configuring PHPBrew we need to add ${logger.style.code('[[ -e ~/.phpbrew/bashrc ]] && source ~/.phpbrew/bashrc')} line to your ${ shellConfigFileName } file.
-Do you want to do it now?`
+Do you want to do it now?`,
+            choices: [{
+                name: 'yes',
+                message: 'Yeah, thanks'
+            }, {
+                name: 'no',
+                message: 'No, I will deal with this myself'
+            }]
         });
 
-        if (!addLineToShellConfigFIle) {
+        if (addLineToShellConfigFIle === 'no') {
             task.skip();
             return;
         }
@@ -101,16 +107,26 @@ Do you want to do it now?`
             );
         } else {
             const continueInstall = await task.prompt({
-                type: 'Confirm',
+                type: 'Select',
                 message: `Unfortunately we cannot automatically add necessary configuration for your shell ${process.env.SHELL}!
 You will need to that manually!
 
 Add following string to your shells configuration file: ${logger.style.code('[[ -e ~/.phpbrew/bashrc ]] && source ~/.phpbrew/bashrc')}
 
-When you ready, press select Yes and installation will continue.`
+When you ready, press Enter and installation will continue.`,
+                choices: [
+                    {
+                        name: 'yes',
+                        message: 'YES'
+                    },
+                    {
+                        name: 'no',
+                        message: 'Exit installation'
+                    }
+                ]
             });
 
-            if (!continueInstall) {
+            if (continueInstall === 'no') {
                 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/util/exec-async-command.d.ts

@@ -11,6 +11,7 @@ interface ExecAsyncSpawnOptions<T extends boolean> {
     withCode?: T
     // only for mac
     useRosetta2?: boolean
+    env: NodeJS.ProcessEnv
 }
 
 /**

package/lib/util/exec-async-command.js

@@ -10,11 +10,16 @@ const execAsyncSpawn = (command, {
     logOutput = false,
     cwd,
     withCode = false,
-    useRosetta2 = false
+    useRosetta2 = false,
+    env = process.env
 } = {}) => {
+    /**
+     * @type {import('child_process').SpawnOptionsWithoutStdio}
+     */
     const spawnOptions = {
         stdio: pipeInput ? ['inherit', 'pipe', 'pipe'] : 'pipe',
-        cwd
+        cwd,
+        env
     };
 
     /**

package/lib/util/get-php-for-phpbrew.js

@@ -0,0 +1,30 @@
+const fs = require('fs');
+const path = require('path');
+const phpbrewConfig = require('../config/phpbrew');
+const pathExists = require('./path-exists');
+
+const getPHPForPHPBrewBin = async () => {
+    if (!await pathExists(phpbrewConfig.phpPath)) {
+        return '';
+    }
+
+    const buildedPHPs = await fs.promises.readdir(phpbrewConfig.phpPath, {
+        encoding: 'utf-8',
+        withFileTypes: true
+    });
+
+    const phpForPHPBrew = buildedPHPs.find((p) => p.isDirectory() && p.name.endsWith('phpbrew'));
+
+    if (phpForPHPBrew) {
+        const phpBinPath = path.join(phpbrewConfig.phpPath, phpForPHPBrew.name, 'bin');
+        if (await pathExists(phpBinPath)) {
+            return phpBinPath;
+        }
+    }
+
+    return '';
+};
+
+module.exports = {
+    getPHPForPHPBrewBin
+};

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.16.0-alpha.3",
+    "version": "1.16.0-alpha.4",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -53,5 +53,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "1801104ed104a124f8d08cc81008d21b792857e4"
+    "gitHead": "987f793ba2d0bb3bcabea54d3b996a5204222738"
 }