@scandipwa/magento-scripts 2.4.0-alpha.0 → 2.4.0-alpha.1

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

@@ -1,22 +1,26 @@
 const { spawn } = require('child_process')
-const { runCommand } = require('../tasks/docker/containers/container-api')
+const {
+    runCommand,
+    execCommand
+} = require('../tasks/docker/containers/container-api')
 
 /**
- * @param {{ containerName: string, commands: string[], user?: string }} param0
+ * @param {{ containerName: string, command: string, user?: string }} param0
  * @returns {Promise<never>}
  */
-const executeInContainer = ({ containerName, commands, user }) => {
+const executeInContainer = ({ containerName, command, user }) => {
     if (!process.stdin.isTTY) {
         process.stderr.write('This app works only in TTY mode')
         process.exit(1)
     }
 
-    const userArg = (user && `--user=${user}`) || ''
-    const args = ['exec', '-it', userArg, containerName]
-        .filter(Boolean)
-        .concat(...commands.map((command) => command.split(' ')).flat())
+    const execArgs = execCommand({
+        container: containerName,
+        command,
+        user
+    })
 
-    spawn('docker', args, {
+    spawn('bash', ['-c', execArgs.join(' ')], {
         stdio: [0, 1, 2]
     })
 

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.0-alpha.0",
+    "version": "2.4.0-alpha.1",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -59,5 +59,5 @@
         "@types/node": "^20.10.4",
         "@types/yargs": "^17.0.13"
     },
-    "gitHead": "684832cd42a2a9b37bcb4a03a4196221e3802a74"
+    "gitHead": "93c885dd9506109a56c5363a22c1eb9a0a234ef4"
 }

package/typings/context.d.ts

@@ -18,7 +18,6 @@ export interface ListrContext {
     throwMagentoVersionMissing: boolean
     projectPath: string
     systemDFData?: systemApi.SystemDFResult
-    debug: boolean
     verbose: boolean
     magentoVersion: string
     composerVersion: string
@@ -29,6 +28,7 @@ export interface ListrContext {
     ports: {
         app: number
         fpm: number
+        fpmXdebug: number
         xdebug: number
         mariadb: number
         redis: number
@@ -42,6 +42,7 @@ export interface ListrContext {
     cachedPorts?: {
         app: number
         fpm: number
+        fpmXdebug: number
         xdebug: number
         mariadb: number
         redis: number
@@ -67,6 +68,11 @@ export interface ListrContext {
         php: {
             iniTemplatePath: string
             fpmConfPath: string
+            fpmTemplatePath: string
+            debugIniPath: string
+            debugTemplatePath: string
+            debugFpmConfPath: string
+            debugFpmTemplatePath: string
             extensions: PHPExtensions
             version: string
         }
@@ -91,7 +97,7 @@ export interface ListrContext {
                     }
                 }
             >
-            getContainers(ports?: ListrContext['ports']): Record<'php' | 'sslTerminator' | 'nginx' | 'redis' | 'mariadb' | 'elasticsearch' | 'maildev' | 'varnish',
+            getContainers(ports?: ListrContext['ports']): Record<'php' | 'phpWithXdebug' | 'sslTerminator' | 'nginx' | 'redis' | 'mariadb' | 'elasticsearch' | 'maildev' | 'varnish',
                 {
                     _: string
                     ports: string[]
@@ -100,12 +106,12 @@ export interface ListrContext {
                     }
                     env: Record<string, string>
                     mountVolumes: string[]
+                    pullImage?: boolean
                     mounts: string[]
                     restart: string
                     securityOptions: string[]
                     network: string
                     image: string
-                    debugImage?: string
                     remoteImages?: string[]
                     name: string
                     command: string

package/typings/index.d.ts

@@ -189,11 +189,6 @@ export interface PHPConfiguration {
      */
     baseImage: string
 
-    /**
-     * Image with XDebug enabled
-     */
-    debugImage: string
-
     /**
      * Configuration file template location
      *