@scandipwa/magento-scripts 2.4.8 → 2.4.9-alpha.1

package/lib/config/docker.js

@@ -114,11 +114,11 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
     const getContainers = (ports = {}) => {
         const composerAuthEnv = process.env.COMPOSER_AUTH
             ? {
-                  COMPOSER_AUTH: `'${JSON.stringify(
+                  COMPOSER_AUTH: `${JSON.stringify(
                       JSON.parse(process.env.COMPOSER_AUTH),
                       null,
                       0
-                  )}'`
+                  )}`
               }
             : {}
 

package/lib/config/port-config.js

@@ -35,6 +35,30 @@ const getUsedByOtherCMAProjectsPorts = async () => {
     )
 }
 
+const getUsedByOtherCMAProjectsXDebugPorts = async () => {
+    const portConfigs = await Promise.all(
+        Object.keys(getProjects())
+            .filter((projectPath) => projectPath !== process.cwd())
+            .map((projectPath) =>
+                getJsonfileData(
+                    path.join(
+                        projectPath,
+                        'node_modules',
+                        '.create-magento-app-cache',
+                        'port-config.json'
+                    )
+                )
+            )
+    )
+
+    const xdebugPorts = portConfigs
+        .filter(Boolean)
+        .map((portConfig) => portConfig.xdebug)
+        .filter(Boolean)
+
+    return Array.from(new Set(xdebugPorts))
+}
+
 /**
  * @param {Number} port
  * @param {Object} [options]
@@ -99,6 +123,8 @@ const getPortsConfig = async (ports, options = {}) => {
 
     if (useNonOverlappingPorts) {
         p = p.concat(await getUsedByOtherCMAProjectsPorts())
+    } else {
+        p = p.concat(await getUsedByOtherCMAProjectsXDebugPorts())
     }
 
     const { xdebug: _, ...portsWithoutXDebug } = mergedPorts

package/lib/tasks/docker/containers/container-api.js

@@ -1,6 +1,30 @@
 /* eslint-disable max-len */
 const { execAsyncSpawn } = require('../../../util/exec-async-command')
 
+/**
+ * @param {Record<string, unknown> | undefined} value
+ */
+const transformEnvValue = (value) => {
+    if (!value) {
+        return ''
+    }
+
+    // Yes, it is made using for loop for better readability
+
+    /** @type {string[]} */
+    const envArguments = []
+
+    for (const [key, val] of Object.entries(value)) {
+        if (typeof val === 'string' && val) {
+            envArguments.push(`--env ${key}='${val.replaceAll("'", "\\'")}'`)
+        } else if (String(val)) {
+            envArguments.push(`--env ${key}=${val}`)
+        }
+    }
+
+    return envArguments
+}
+
 /**
  * @param {import('./container-api').ContainerRunOptions} options
  * @returns {string[]}
@@ -48,16 +72,7 @@ const runCommand = (options) => {
                 (mount) => `-v=${mount.replaceAll(' ', '\\ ')}`
             )) ||
         ''
-    const envArgs = !env
-        ? ''
-        : Object.entries(env).map(
-              ([key, value]) =>
-                  `--env=${key}=${
-                      typeof value === 'string'
-                          ? value.replaceAll(' ', '\\ ')
-                          : value
-                  }`
-          )
+    const envArgs = transformEnvValue(env)
     const nameArg = (name && `--name=${name}`) || ''
     const entrypointArg = (entrypoint && `--entrypoint="${entrypoint}"`) || ''
     const healthCheckArg =
@@ -120,18 +135,7 @@ const run = (options, execOptions = {}) =>
  */
 const execCommand = (options) => {
     const { command, container, env, tty, user, workdir, interactive } = options
-    const envArgs = !env
-        ? ''
-        : Object.entries(env)
-              .map(
-                  ([key, value]) =>
-                      `--env=${key}=${
-                          typeof value === 'string'
-                              ? value.replaceAll(' ', '\\ ')
-                              : value
-                      }`
-              )
-              .join(' ')
+    const envArgs = transformEnvValue(env)
     const ttyArg = tty ? '--tty' : ''
     const userArg = user ? `--user=${user}` : ''
     const workdirArg = workdir ? `--workdir=${workdir}` : ''

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

@@ -62,7 +62,7 @@ const updateEnvPHP = () => ({
                 REDIS_PORT: ctx.ports.redis,
                 ADMIN_URI: ctx.config.overridenConfiguration.magento.adminuri,
                 HOST_MACHINE: hostMachine,
-                PORTS: `'${JSON.stringify(ctx.ports)}'`
+                PORTS: `${JSON.stringify(ctx.ports)}`
             },
             command: 'php ./update-env.php',
             mountVolumes: [

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

@@ -9,7 +9,7 @@ const checkNodeVersion = () => ({
     task: (ctx, task) => {
         const { node } = process.versions
 
-        if (!semver.gte(node, '12.0.0')) {
+        if (!semver.gte(node, '16.0.0')) {
             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/util/exec-async-command.d.ts

@@ -6,6 +6,7 @@ import { ListrContext } from '../../typings/context'
 interface ExecAsyncSpawnOptions<T extends boolean> {
     callback?: (result: string) => void
     pipeInput?: boolean
+    pipeOutput?: boolean
     logOutput?: boolean
     cwd?: string
     withCode?: T

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

@@ -12,6 +12,7 @@ const execAsyncSpawn = (
     {
         callback,
         pipeInput,
+        pipeOutput,
         logOutput = false,
         cwd,
         withCode = false,
@@ -23,7 +24,11 @@ const execAsyncSpawn = (
      * @type {import('child_process').SpawnOptionsWithoutStdio}
      */
     const spawnOptions = {
-        stdio: pipeInput ? ['inherit', 'pipe', 'pipe'] : 'pipe',
+        stdio: pipeInput
+            ? ['inherit', 'pipe', 'pipe']
+            : pipeOutput
+            ? 'inherit'
+            : 'pipe',
         cwd,
         env
     }
@@ -74,8 +79,10 @@ const execAsyncSpawn = (
             }
         }
 
-        childProcess.stdout.on('data', addChunk)
-        childProcess.stderr.on('data', addChunk)
+        if (!pipeOutput) {
+            childProcess.stdout.on('data', addChunk)
+            childProcess.stderr.on('data', addChunk)
+        }
 
         childProcess.on('error', (error) => {
             reject(error)

package/lib/util/execute-in-container.js

@@ -1,8 +1,5 @@
 const { spawn } = require('child_process')
-const {
-    runCommand,
-    execCommand
-} = require('../tasks/docker/containers/container-api')
+const { execCommand, run } = require('../tasks/docker/containers/container-api')
 
 /**
  * @param {{ containerName: string, commands: string[], user?: string }} param0
@@ -36,30 +33,29 @@ const executeInContainer = ({ containerName, commands, user }) => {
  * @param {import('../tasks/docker/containers/container-api').ContainerRunOptions} options
  * @param {string[]} commands
  */
-const runInContainer = (options, commands) => {
+const runInContainer = async (options, commands) => {
     if (!process.stdin.isTTY) {
         process.stderr.write('This app works only in TTY mode')
         process.exit(1)
     }
 
-    const runArgs = runCommand({
-        ...options,
-        tty: true,
-        detach: false,
-        rm: true
-    })
-
     const [commandBin, ...commandsArgs] = commands
 
-    const [command, ...args] = runArgs
+    const runResult = await run(
+        {
+            ...options,
+            command: `${commandBin} ${commandsArgs.join(' ')}`,
+            tty: true,
+            detach: false,
+            rm: true
+        },
+        {
+            withCode: true,
+            pipeOutput: true
+        }
+    )
 
-    const child = spawn(command, [...args, commandBin, ...commandsArgs], {
-        stdio: 'inherit'
-    })
-
-    child.on('close', (code) => {
-        process.exit(code)
-    })
+    process.exit(runResult.code)
 }
 
 module.exports = {

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": "2.4.8",
+    "version": "2.4.9-alpha.1",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -59,5 +59,5 @@
         "@types/node": "^20.14.11",
         "@types/yargs": "^17.0.32"
     },
-    "gitHead": "f3b396e1d55aa323326cc49ebe03faed8b6eed46"
+    "gitHead": "b26dcbe7ae4d2334db66adf0fecd6668154bbd22"
 }