@scandipwa/magento-scripts 2.4.5-alpha.0 → 2.4.6-alpha.0

package/lib/config/templates/git-postcheckout-hook.template

@@ -25,32 +25,39 @@ if [ -z "$CHANGED_FILES" ]; then
   exit 0
 fi
 
+# Extract the first directory name from changed composer files
+CHANGED_DIR=$(basename "$(git rev-parse --show-toplevel)")
+
+# Get branch names from refs
+OLD_BRANCH=$(git name-rev --name-only "$OLD_REF" 2>/dev/null | sed 's/^remotes\///' || echo "$OLD_REF")
+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="Detected changes in:\n$CHANGED_FILES\n\nPlease run: composer install"
+MESSAGE_BODY="Changes detected in: $CHANGED_DIR\nBranch: $OLD_BRANCH → $NEW_BRANCH\n\nPlease run composer install or npm run start"
 
 # Cross-platform desktop notification with multiple fallbacks
 send_notification() {
   local title="$1"
   local body="$2"
-  
+
   # Try Linux notify-send first
   if command -v notify-send >/dev/null 2>&1; then
     notify-send -u normal -t 8000 "$title" "$body"
     return 0
   fi
-  
+
   # Try macOS terminal-notifier
   if command -v terminal-notifier >/dev/null 2>&1; then
     terminal-notifier -title "$title" -message "$body" -timeout 8
     return 0
   fi
-  
+
   # Try macOS osascript (AppleScript) as fallback
   if command -v osascript >/dev/null 2>&1; then
     osascript -e "display notification \"$body\" with title \"$title\""
     return 0
   fi
-  
+
   # Final fallback to stdout
   echo "$title"
   echo "$body"

package/lib/tasks/file-system/create-git-hook-notification.js

@@ -1,58 +1,112 @@
 const path = require('path')
 const fs = require('fs')
 const UnknownError = require('../../errors/unknown-error')
-const setConfigFile = require('../../util/set-config')
 const { execAsyncSpawn } = require('../../util/exec-async-command')
+const pathExists = require('../../util/path-exists')
+
+/**
+ * @param {string} p
+ */
+function isExec(p) {
+    try {
+        fs.accessSync(p, fs.constants.X_OK)
+        return true
+    } catch (e) {
+        return false
+    }
+}
 
 /**
  * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
 const createGitHookNotification = () => ({
-    title: 'Setting git hook notification',
-    task: async (ctx) => {
+    title: 'Setting Git Hook Notification',
+    task: async (ctx, task) => {
         const gitHookTemplatePath = path.join(
             ctx.config.baseConfig.templateDir,
             'git-postcheckout-hook.template'
         )
 
-        const gitRoot = await execAsyncSpawn('git rev-parse --show-toplevel')
+        const [gitRootResult, currentGitHookPathResult] = await Promise.all([
+            execAsyncSpawn('git rev-parse --show-toplevel', {
+                withCode: true
+            }),
+            execAsyncSpawn(`git config --get core.hooksPath`, {
+                withCode: true
+            })
+        ])
 
-        let currentGitHookPath = await execAsyncSpawn(
-            `git config --get core.hooksPath`
-        )
+        if (currentGitHookPathResult.code !== 0) {
+            throw new UnknownError(
+                `Unexpected error accrued during git hook notification creation\n\n${currentGitHookPathResult.result}`
+            )
+        }
+
+        if (gitRootResult.code !== 0) {
+            throw new UnknownError(
+                `Unexpected error accrued during git hook notification creation\n\n${gitRootResult.result}`
+            )
+        }
+
+        const tasks = []
 
-        if (!currentGitHookPath.trim()) {
-            await execAsyncSpawn(`git config core.hooksPath .git/hooks`)
+        if (!currentGitHookPathResult.result.trim()) {
+            tasks.push({
+                title: 'Setting Git Hook Path',
+                task: async () => {
+                    const { code } = await execAsyncSpawn(
+                        `git config core.hooksPath .git/hooks`,
+                        {
+                            withCode: true
+                        }
+                    )
 
-            currentGitHookPath = '.git/hooks'
+                    if (code !== 0) {
+                        throw new UnknownError(
+                            `Unexpected error accrued during git hook notification creation\n\n${code}`
+                        )
+                    }
+
+                    currentGitHookPathResult.result = '.git/hooks'
+                }
+            })
         }
 
         const gitHookPath = path.join(
-            gitRoot,
-            currentGitHookPath,
+            gitRootResult.result,
+            currentGitHookPathResult.result.trim(),
             'post-checkout'
         )
 
-        try {
-            await setConfigFile({
-                configPathname: gitHookPath,
-                template: gitHookTemplatePath,
-                overwrite: false
+        if (!(await pathExists(gitHookPath))) {
+            tasks.push({
+                title: 'Copying Git Hook Template',
+                task: async () => {
+                    await fs.promises.cp(gitHookTemplatePath, gitHookPath)
+                }
             })
-        } catch (e) {
-            throw new UnknownError(
-                `Unexpected error accrued during git hook notification creation\n\n${e}`
-            )
         }
 
         // check if gitHookPath is executable
-        const isExecutable = await fs.promises.stat(gitHookPath)
-        if (isExecutable.mode & 0o111) {
-            return
+        const isExecutable = isExec(gitHookPath)
+        if (!isExecutable) {
+            tasks.push({
+                title: 'Making Git Hook Executable',
+                task: async () => {
+                    await execAsyncSpawn(`chmod +x ${gitHookPath}`, {
+                        withCode: true
+                    })
+                }
+            })
         }
 
-        await execAsyncSpawn(`chmod +x ${gitHookPath}`)
-    }
+        if (tasks.length > 0) {
+            return task.newListr(tasks)
+        }
+
+        task.skip()
+    },
+    exitOnError: false
 })
 
 module.exports = createGitHookNotification

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.5-alpha.0",
+    "version": "2.4.6-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": "6d3f49a587a3db183e9f89dc936e8c7357accac3"
+    "gitHead": "8d5f2908a9e9f3c929625794ec00214de4045b5f"
 }