@scandipwa/magento-scripts 2.4.9-alpha.0 → 2.4.9-alpha.2

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

@@ -15,9 +15,9 @@ const transformEnvValue = (value) => {
     const envArguments = []
 
     for (const [key, val] of Object.entries(value)) {
-        if (typeof val === 'string') {
+        if (typeof val === 'string' && val) {
             envArguments.push(`--env ${key}='${val.replaceAll("'", "\\'")}'`)
-        } else {
+        } else if (String(val)) {
             envArguments.push(`--env ${key}=${val}`)
         }
     }

package/lib/tasks/docker/project-image-builder.js

@@ -189,11 +189,9 @@ const buildDockerFileInstructions = async (
                 addgroup www-data ${username}`
         )
 
-        if (ctx.isDockerDesktop) {
-            dockerFileInstructions.run(
-                `chown -R ${username}:${username} /composer/home/cache`
-            )
-        }
+        dockerFileInstructions.run(
+            `chown -R ${username}:${username} /composer/home/cache`
+        )
     }
 
     dockerFileInstructions.workDir(ctx.config.baseConfig.containerMagentoDir)

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.9-alpha.0",
+    "version": "2.4.9-alpha.2",
     "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": "70cc10b1dbc83ddd0917ae02fef3b09e8bcaba52"
+    "gitHead": "d65444c5a20dab91d6b66534e8e997133aafd0f1"
 }