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

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/config/templates/git-postcheckout-hook.template

@@ -33,12 +33,13 @@ OLD_BRANCH=$(git name-rev --name-only "$OLD_REF" 2>/dev/null | sed 's/^remotes\/
 NEW_BRANCH=$(git name-rev --name-only "$NEW_REF" 2>/dev/null | sed 's/^remotes\///' || echo "$NEW_REF")
 
 MESSAGE_TITLE="Composer dependencies changed"
-MESSAGE_BODY="Changes detected in: $CHANGED_DIR\nBranch: $OLD_BRANCH → $NEW_BRANCH\n\nPlease run composer install or npm run start"
+MESSAGE_BODY="Changes detected in: $CHANGED_DIR\nBranch: $OLD_BRANCH → $NEW_BRANCH\n\nPlease run composer install (in CLI) or npm run start"
 
 # Cross-platform desktop notification with multiple fallbacks
 send_notification() {
   local title="$1"
   local body="$2"
+  local mac_alert_file="/tmp/.git_postcheckout_alert_shown"
 
   # Try Linux notify-send first
   if command -v notify-send >/dev/null 2>&1; then
@@ -46,15 +47,25 @@ send_notification() {
     return 0
   fi
 
-  # Try macOS terminal-notifier
+  # Try macOS terminal-notifier (alert once, then notification)
   if command -v terminal-notifier >/dev/null 2>&1; then
-    terminal-notifier -title "$title" -message "$body" -timeout 8
+    if [ ! -f "$mac_alert_file" ]; then
+      terminal-notifier -title "$title" -message "$body" -sound Basso
+      touch "$mac_alert_file"
+    else
+      terminal-notifier -title "$title" -message "$body" -timeout 8
+    fi
     return 0
   fi
 
-  # Try macOS osascript (AppleScript) as fallback
+  # Try macOS osascript (AppleScript) as fallback (alert once, then notification)
   if command -v osascript >/dev/null 2>&1; then
-    osascript -e "display notification \"$body\" with title \"$title\""
+    if [ ! -f "$mac_alert_file" ]; then
+      osascript -e "display alert \"$title\" message \"$body\""
+      touch "$mac_alert_file"
+    else
+      osascript -e "display notification \"$body\" with title \"$title\""
+    fi
     return 0
   fi
 
@@ -64,3 +75,8 @@ send_notification() {
 }
 
 send_notification "$MESSAGE_TITLE" "$MESSAGE_BODY"
+
+echo ""
+echo "$MESSAGE_TITLE"
+echo ""
+echo "$MESSAGE_BODY"

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') {
+            envArguments.push(`--env ${key}='${val.replaceAll("'", "\\'")}'`)
+        } else {
+            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/file-system/create-git-hook-notification.js

@@ -36,6 +36,11 @@ const createGitHookNotification = () => ({
             })
         ])
 
+        if (gitRootResult.code === 128) {
+            task.skip('not a git repository')
+            return
+        }
+
         if (gitRootResult.code !== 0) {
             throw new UnknownError(
                 `Unexpected error accrued during git hook notification creation\n\n${gitRootResult.result}`
@@ -68,7 +73,7 @@ const createGitHookNotification = () => ({
 
         tasks.push({
             title: 'Copying Git Hook Template',
-            skip: async () => !(await pathExists(gitHookPath)),
+            skip: async () => await pathExists(gitHookPath),
             task: async () => {
                 await fs.promises.cp(gitHookTemplatePath, gitHookPath)
             }

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/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.7",
+    "version": "2.4.9-alpha.0",
     "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": "03c17ab2a071da6198ec99a8a59f0f897a0ba888"
+    "gitHead": "70cc10b1dbc83ddd0917ae02fef3b09e8bcaba52"
 }